Fixes for problems with starting and stopping apps in a minimal system
- Missing app dependencies
- Incorrect provider registrations
- Fatal execeptions thrown when external resources are not present
Change-Id: I3fdcf0666c88a47f399a722a9ab549d1104ff40e
diff --git a/providers/bgp/BUILD b/providers/bgp/BUILD
index b996b79..b47739a 100644
--- a/providers/bgp/BUILD
+++ b/providers/bgp/BUILD
@@ -12,7 +12,11 @@
category = "Provider",
description = "BGP protocol southbound providers.",
included_bundles = BUNDLES,
- required_apps = ["org.onosproject.evpn-route-service"],
+ required_apps = [
+ "org.onosproject.evpn-route-service",
+ "org.onosproject.tunnel",
+ "org.onosproject.pcep-api",
+ ],
title = "BGP Provider",
url = "http://onosproject.org",
)
diff --git a/providers/bgpcep/BUILD b/providers/bgpcep/BUILD
index 1ca61bc..9910827 100644
--- a/providers/bgpcep/BUILD
+++ b/providers/bgpcep/BUILD
@@ -20,6 +20,11 @@
category = "Provider",
description = "BGPCEP providers.",
included_bundles = BUNDLES,
+ required_apps = [
+ "org.onosproject.tunnel",
+ "org.onosproject.bgp",
+ "org.onosproject.pcep-api",
+ ],
title = "BGPCEP Provider",
url = "http://onosproject.org",
)
diff --git a/providers/ovsdb/host/BUILD b/providers/ovsdb/host/BUILD
index 63e86f7..b59626e 100644
--- a/providers/ovsdb/host/BUILD
+++ b/providers/ovsdb/host/BUILD
@@ -11,6 +11,7 @@
app_name = "org.onosproject.ovsdbhostprovider",
category = "Provider",
description = "OVSDB Host provider.",
+ required_apps = ["org.onosproject.ovsdb-base"],
title = "OVSDB host Provider",
url = "http://onosproject.org",
)
diff --git a/providers/pcep/BUILD b/providers/pcep/BUILD
index a0e6254..fa0a676 100644
--- a/providers/pcep/BUILD
+++ b/providers/pcep/BUILD
@@ -16,6 +16,8 @@
required_apps = [
"org.onosproject.pcep-api",
"org.onosproject.optical-model",
+ "org.onosproject.tunnel",
+ "org.onosproject.bgp",
],
title = "PCEP Provider",
url = "http://onosproject.org",
diff --git a/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java b/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
index d0f8c1b..26d6968 100644
--- a/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
+++ b/providers/pcep/topology/src/main/java/org/onosproject/provider/pcep/topology/impl/PcepTopologyProvider.java
@@ -86,7 +86,7 @@
public PcepTopologyProvider() {
//In BGP-PCEP app, since both BGP and PCEP topology provider have same scheme
//so BGP will be primary and PCEP topology provider will be ancillary.
- super(new ProviderId("l3", "org.onosproject.provider.pcep", true));
+ super(new ProviderId("l3", "org.onosproject.provider.bgp", true));
}
private static final Logger log = LoggerFactory