Nokia: Update service profiles for metro-net and metronet-local
Change-Id: I94554fe05ade1a9162ab25946ed8882ec70c150b
diff --git a/common/Makedefs b/common/Makedefs
index 419a594..d20f493 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -69,5 +69,8 @@
NG_XOS_LIB_BRANCH ?= $(DEFAULT_BRANCH)
NG_XOS_LIB_URL ?= $(CORD_BASE_GIT_URL)/ng-xos-lib.git
+VNODLOCAL_BRANCH ?= $(DEFAULT_BRANCH)
+VNODLOCAL_GIT_URL ?= $(CORD_BASE_GIT_URL)/metronet-local.git
+
GLOBALXOS_BRANCH ?= $(DEFAULT_BRANCH)
GLOBALXOS_GIT_URL ?= $(CORD_BASE_GIT_URL)/globalxos.git
diff --git a/common/Makefile b/common/Makefile
index f8361ec..b66ee6d 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -68,7 +68,9 @@
$(SERVICE_DIR)/vsg \
$(SERVICE_DIR)/vtn \
$(SERVICE_DIR)/vtr \
- $(SERVICE_DIR)/metro-net
+ $(SERVICE_DIR)/metro-net \
+ $(SERVICE_DIR)/metronet-local
+
$(SERVICE_DIR):
mkdir -p $(SERVICE_DIR)
@@ -109,6 +111,9 @@
$(SERVICE_DIR)/openstack:
git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(OPENSTACK_BRANCH) $(OPENSTACK_GIT_URL)
+$(SERVICE_DIR)/metronet-local:
+ git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(VNODLOCAL_BRANCH) $(VNODLOCAL_GIT_URL)
+
$(SERVICE_DIR)/globalxos:
git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(GLOBALXOS_BRANCH) $(GLOBALXOS_GIT_URL)
@@ -124,6 +129,7 @@
git -C $(SERVICE_DIR)/hypercache pull
git -C $(SERVICE_DIR)/metro-net pull
git -C $(SERVICE_DIR)/openstack pull
+ git -C $(SERVICE_DIR)/metronet-local pull
cord_libraries: $(LIBRARY_DIR) \
$(LIBRARY_DIR)/ng-xos-lib
diff --git a/metronetwork/Makefile b/metronetwork/Makefile
index f87ebb4..e083347 100644
--- a/metronetwork/Makefile
+++ b/metronetwork/Makefile
@@ -11,11 +11,17 @@
XOS_BOOTSTRAP_PORT ?= 9998
XOS_UI_PORT ?= 9999
+BOOTSTRAP_DEVEL_YML ?= $(CONFIG_DIR)/docker-compose-bootstrap-devel.yml
+
# Include common functions
include $(COMMON_DIR)/Makefile
metronetwork: prereqs config_dirs xos_download cord_services cord_libraries bootstrap dashboard onboarding ecord_services
+# Targets to accomodate users with HTTP proxies
+metronetworkconfig: prereqs config_dirs xos_download cord_services cord_libraries
+metronetworklaunch: bootstrap dashboard onboarding ecord_services
+
dashboard:
$(RUN_TOSCA_BOOTSTRAP) dashboard.yaml
@@ -38,3 +44,19 @@
clean-config-folder:
sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_mcord_config
sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_cord_config
+
+onboardmetronetlocal:
+ @echo "[ONBOARDING VNOD LOCAL]"
+ # on-board the vnodlocal service - used for testing
+ $(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(LIBRARY_DIR)/ng-xos-lib/ng-xos-lib-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/metronet-local/xos/vnodlocalservice-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/enable-onboarding.yaml
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/ng-xos-lib
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vnodlocal
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+devel:
+ # Simply start the DB - other steps will be done manually
+ sudo CONFIG_DIR=$(CONFIG_DIR) docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_DEVEL_YML) up -d
diff --git a/metronetwork/docker-compose-bootstrap.yml.devel b/metronetwork/docker-compose-bootstrap-devel.yml
similarity index 100%
rename from metronetwork/docker-compose-bootstrap.yml.devel
rename to metronetwork/docker-compose-bootstrap-devel.yml
diff --git a/metronetwork/ecord-services.yaml b/metronetwork/ecord-services.yaml
index aa5bcb1..f13a080 100644
--- a/metronetwork/ecord-services.yaml
+++ b/metronetwork/ecord-services.yaml
@@ -20,5 +20,5 @@
restCtrlUrl: http://10.10.10.10:8181/onos
username: karaf
password: karaf
- administrativeState: syncrequested
+ administrativeState: disabled
id: TestMetroNet
\ No newline at end of file