Merge "Removed useless target"
diff --git a/mcord/Makefile b/mcord/Makefile
index 7361750..59e526f 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -13,7 +13,7 @@
RUN_TOSCA=python ../common/run_tosca.py $(XOS_UI_PORT) $(ADMIN_USERNAME) $(ADMIN_PASSWORD)
.PHONY: xos
-xos: prereqs dirs download_xos download_services bootstrap onboarding podconfig
+xos: prereqs dirs download_xos download_services bootstrap onboarding podconfig slicing-ui
prereqs:
sudo make -f ../common/Makefile.prereqs
@@ -30,7 +30,7 @@
@echo "XOS Image Commit Date: `docker inspect -f '{{ .Config.Labels.XOS_GIT_COMMIT_DATE }}' xosproject/xos`"
sudo rm -f onboarding-docker-compose/docker-compose.yml
sudo CONFIG_DIR=$(CONFIG_DIR) docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) up -d
- bash ../common/wait_for_xos_port.sh 81
+ bash ../common/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < ../common/fixtures.yaml
sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < ../common/mydeployment.yaml
$(RUN_TOSCA_BOOTSTRAP) xos.yaml
@@ -50,7 +50,7 @@
onboarding:
@echo "[ONBOARDING]"
# on-board any services here
- bash ../common/wait_for_onboarding_ready.sh 81 xos
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
$(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
sudo cp id_rsa key_import/vBBU_rsa
@@ -64,16 +64,16 @@
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtn/xos/vtn-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/onos-service/xos/onos-onboard.yaml
- #$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/\fabric-onboard.yaml
+ # $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/\fabric-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) synchronizers.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
- bash ../common/wait_for_onboarding_ready.sh 81 services/vbbu
- bash ../common/wait_for_onboarding_ready.sh 81 services/vpgwc
- bash ../common/wait_for_onboarding_ready.sh 81 services/vtn
- bash ../common/wait_for_onboarding_ready.sh 81 services/onos
- #bash ../common/wait_for_onboarding_ready.sh 81 services/fabric
- bash ../common/wait_for_onboarding_ready.sh 81 xos
- bash ../common/wait_for_xos_port.sh 80
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vbbu
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vpgwc
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vtn
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/onos
+ # bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/fabric
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
podconfig: nodes.yaml images.yaml
@echo "[PODCONFIG]"
@@ -110,7 +110,7 @@
rebuild:
bash ../common/rebuild.sh $(XOS_BOOTSTRAP_PORT)
- bash ../common/wait_for_onboarding_ready.sh 81 xos
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
exampleservice: onboard-exampleservice
$(RUN_TOSCA) pod-exampleservice.yaml
@@ -122,9 +122,9 @@
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/exampleservice/xos/exampleservice-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) exampleservice-synchronizer.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
- bash ../common/wait_for_onboarding_ready.sh 81 services/exampleservice
- bash ../common/wait_for_onboarding_ready.sh 81 xos
- bash ../common/wait_for_xos_port.sh 80
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/exampleservice
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
cord-monitoringservice: ceilometer_custom_images onboard-monitoringservice
$(RUN_TOSCA) monitoringservice.yaml
@@ -135,9 +135,9 @@
sudo cp id_rsa.pub key_import/monitoringservice_rsa.pub
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/monitoring/xos/monitoring-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) monitoring_synchronizer.yaml
- bash ../common/wait_for_onboarding_ready.sh 81 services/monitoring
- bash ../common/wait_for_onboarding_ready.sh 81 xos
- bash ../common/wait_for_xos_port.sh 80
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/monitoring
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
download-monitoringservice:
make -f ../common/Makefile.services monitoring_services
@@ -202,3 +202,15 @@
local_containers: prereqs download_xos
make -f ../common/Makefile.containers update_certs xos_base xos_devel synchronizer onboarding_synchronizer
+onboard-slicing: slicing-ui
+ @echo "[ONBOARDING]"
+ # on-board slicing services here
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ $(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/mcord_slicing_ui/xos/mcord-slicing-onboard.yaml
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/mcord_slicing_ui
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+slicing-ui:
+ $(RUN_TOSCA) ./mcord-slicing-ui.yaml
\ No newline at end of file
diff --git a/mcord/mcord-slicing-ui.yaml b/mcord/mcord-slicing-ui.yaml
new file mode 100644
index 0000000..776e370
--- /dev/null
+++ b/mcord/mcord-slicing-ui.yaml
@@ -0,0 +1,26 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: >
+ * Some sample data to populate the demo frontend
+
+imports:
+ - custom_types/xos.yaml
+
+topology_template:
+ node_templates:
+ # You can use this recipe to load the dashboard in the system:
+ Mcord-slicing:
+ type: tosca.nodes.DashboardView
+ properties:
+ url: template:xosMcord-slicing
+
+ # And this recipe to activate the dashboard for a user:
+ padmin@vicci.org:
+ type: tosca.nodes.User
+ properties:
+ no-create: true
+ no-delete: true
+ requirements:
+ - mcord-slicing_dashboard:
+ node: Mcord-slicing
+ relationship: tosca.relationships.UsesDashboard
\ No newline at end of file