Merge "Loading NetworkDevice from TOSCA in metro-net profile and triggering test"
diff --git a/metronetwork/Makefile b/metronetwork/Makefile
index c3b1698..a1f08d6 100644
--- a/metronetwork/Makefile
+++ b/metronetwork/Makefile
@@ -56,6 +56,17 @@
bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
+vrouter_service:
+ @echo "[ONBOARDING]"
+ # on-board the metronetwork service
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ $(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vrouter
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
+
services:
$(RUN_TOSCA) ecord-services.yaml
diff --git a/metronetwork/ecord-services.yaml b/metronetwork/ecord-services.yaml
index 68af63a..429948d 100644
--- a/metronetwork/ecord-services.yaml
+++ b/metronetwork/ecord-services.yaml
@@ -13,4 +13,12 @@
type: tosca.nodes.MetroNetworkService
properties:
view_url: /admin/metronetwork/metronetworkservice/$id$/
- kind: metronetwork
\ No newline at end of file
+ kind: metronetwork
+
+ device#metronetworkdevice:
+ type: tosca.nodes.MetroNetworkDevice
+ properties:
+ restCtrlUrl: http://10.10.10.10:8181/onos
+ username: karaf
+ password: karaf
+ administrativeState: syncrequested
\ No newline at end of file