Add vsg,vrouter relative code for short term
(1) once onos synchronizer does not depend on vsg and vrouter,
we should remove vsg and vrouter from M-CORD
(2) changed the compute node name
(3) comment the CORDSubscriber and CORDUser relative code inside setup.yaml for now,
because currently, this two objects are inside olt service.
Change-Id: Ice69e4aa22276da3e94373c0b777303d87c9a703
diff --git a/mcord/Makefile b/mcord/Makefile
index 3edb916..c69d038 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -52,6 +52,9 @@
# on-board any services here
bash ../common/wait_for_onboarding_ready.sh 81 xos
$(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
+
+ sudo cp id_rsa key_import/vsg_rsa
+ sudo cp id_rsa.pub key_import/vsg_rsa.pub
sudo cp id_rsa key_import/vBBU_rsa
sudo cp id_rsa.pub key_import/vBBU_rsa.pub
sudo cp id_rsa key_import/vPGW_rsa
@@ -59,6 +62,8 @@
sudo cp id_rsa key_import/onos_rsa
sudo cp id_rsa key_import/onos_rsa.pub
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vsg/xos/vsg-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vBBU/xos/vBBU-onboard.yaml
# $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtn/xos/vtn-onboard.yaml
@@ -67,6 +72,8 @@
#$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtr/xos/vtr-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) synchronizers.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vrouter
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vsg
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
diff --git a/mcord/files/vcpe_synchronizer_config b/mcord/files/vcpe_synchronizer_config
new file mode 100644
index 0000000..9da6ede
--- /dev/null
+++ b/mcord/files/vcpe_synchronizer_config
@@ -0,0 +1,47 @@
+
+[plc]
+name=plc
+deployment=VICCI
+
+[db]
+name=xos
+user=postgres
+password=password
+host=localhost
+port=5432
+
+[api]
+host=128.112.171.237
+port=8000
+ssl_key=None
+ssl_cert=None
+ca_ssl_cert=None
+ratelimit_enabled=0
+omf_enabled=0
+mail_support_address=support@localhost
+nova_enabled=True
+
+[observer]
+name=vcpe
+dependency_graph=/opt/xos/synchronizers/vsg/model-deps
+steps_dir=/opt/xos/synchronizers/vsg/steps
+sys_dir=/opt/xos/synchronizers/vsg/sys
+deleters_dir=/opt/xos/synchronizers/vsg/deleters
+log_file=console
+#/var/log/hpc.log
+driver=None
+pretend=False
+backoff_disabled=True
+save_ansible_output=True
+# set proxy_ssh to false on cloudlab
+full_setup=True
+proxy_ssh=True
+proxy_ssh_key=/root/setup/node_key
+proxy_ssh_user=root
+
+[networking]
+use_vtn=True
+
+[feefie]
+client_id='vicci_dev_central'
+user_id='pl'
diff --git a/mcord/nodes.yaml b/mcord/nodes.yaml
index 48e7247..432e779 100644
--- a/mcord/nodes.yaml
+++ b/mcord/nodes.yaml
@@ -22,7 +22,7 @@
node: MyDeployment
relationship: tosca.relationships.MemberOfDeployment
- nova-compute:
+ nova-compute-1:
type: tosca.nodes.Node
requirements:
- site:
diff --git a/mcord/setup.yaml b/mcord/setup.yaml
index 9db865e..57ceab7 100644
--- a/mcord/setup.yaml
+++ b/mcord/setup.yaml
@@ -84,58 +84,58 @@
relationship: tosca.relationships.MemberOfSite
# A subscriber
- Stanford:
- type: tosca.nodes.CORDSubscriber
- properties:
- service_specific_id: 123
- firewall_enable: false
- cdn_enable: false
- url_filter_enable: false
- url_filter_level: R
- requirements:
- - house_admin:
- node: johndoe@stanford.us
- relationship: tosca.relationships.AdminPrivilege
+ #Stanford:
+ # type: tosca.nodes.CORDSubscriber
+ # properties:
+ # service_specific_id: 123
+ # firewall_enable: false
+ # cdn_enable: false
+ # url_filter_enable: false
+ # url_filter_level: R
+ # requirements:
+ # - house_admin:
+ # node: johndoe@stanford.us
+ # relationship: tosca.relationships.AdminPrivilege
- Barbera Lapinski:
- type: tosca.nodes.CORDUser
- properties:
- mac: 01:02:03:04:05:06
- level: PG_13
- requirements:
- - household:
- node: Stanford
- relationship: tosca.relationships.SubscriberDevice
+ #Barbera Lapinski:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 01:02:03:04:05:06
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: Stanford
+ # relationship: tosca.relationships.SubscriberDevice
- Norbert Shumway:
- type: tosca.nodes.CORDUser
- properties:
- mac: 90:E2:BA:82:F9:75
- level: PG_13
- requirements:
- - household:
- node: Stanford
- relationship: tosca.relationships.SubscriberDevice
+ #Norbert Shumway:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 90:E2:BA:82:F9:75
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: Stanford
+ # relationship: tosca.relationships.SubscriberDevice
- Fay Muldoon:
- type: tosca.nodes.CORDUser
- properties:
- mac: 68:5B:35:9D:91:D5
- level: PG_13
- requirements:
- - household:
- node: Stanford
- relationship: tosca.relationships.SubscriberDevice
+ #Fay Muldoon:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 68:5B:35:9D:91:D5
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: Stanford
+ # relationship: tosca.relationships.SubscriberDevice
- Janene Earnest:
- type: tosca.nodes.CORDUser
- properties:
- mac: 34:36:3B:C9:B6:A6
- level: PG_13
- requirements:
- - household:
- node: Stanford
- relationship: tosca.relationships.SubscriberDevice
+ #Janene Earnest:
+ # type: tosca.nodes.CORDUser
+ # properties:
+ # mac: 34:36:3B:C9:B6:A6
+ # level: PG_13
+ # requirements:
+ # - household:
+ # node: Stanford
+ # relationship: tosca.relationships.SubscriberDevice
RRU:
type: tosca.nodes.Service
diff --git a/mcord/synchronizers.yaml b/mcord/synchronizers.yaml
index b75b0e5..51bfa34 100644
--- a/mcord/synchronizers.yaml
+++ b/mcord/synchronizers.yaml
@@ -7,6 +7,11 @@
topology_template:
node_templates:
+ servicecontroller#vsg:
+ type: tosca.nodes.ServiceController
+ properties:
+ no-create: true
+ synchronizer_config: /root/setup/files/vcpe_synchronizer_config
servicecontroller#openstack:
type: tosca.nodes.ServiceController
properties:
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
new file mode 100644
index 0000000..d59e912
--- /dev/null
+++ b/mcord/vtn-external.yaml
@@ -0,0 +1,48 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - custom_types/xos.yaml
+
+description: autogenerated node tags file for VTN configuration
+
+topology_template:
+ node_templates:
+
+ service#ONOS_CORD:
+ type: tosca.nodes.ONOSService
+ requirements:
+ properties:
+ kind: onos
+ view_url: /admin/onos/onosservice/$id$/
+ no_container: true
+ rest_hostname: onos-cord
+ replaces: service_ONOS_CORD
+
+ service#vtn:
+ type: tosca.nodes.VTNService
+ properties:
+ view_url: /admin/vtn/vtnservice/$id$/
+ privateGatewayMac: 00:00:00:00:00:01
+ localManagementIp: 10.102.83.2/24
+ ovsdbPort: 6641
+ sshUser: root
+ sshKeyFile: /root/node_key
+ sshPort: 22
+ xosEndpoint: http://xos/
+ xosUser: padmin@vicci.org
+ xosPassword: letmein
+ replaces: service_vtn
+
+ VTN_ONOS_app:
+ type: tosca.nodes.ONOSVTNApp
+ requirements:
+ - onos_tenant:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.TenantOfService
+ - vtn_service:
+ node: service#vtn
+ relationship: tosca.relationships.UsedByService
+ properties:
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/1.1-SNAPSHOT/cord-config-1.1-SNAPSHOT.oar,http://mavenrepo:8080/repository/org/opencord/vtn/1.1-SNAPSHOT/vtn-1.1-SNAPSHOT.oar
+ dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
+ autogenerate: vtn-network-cfg