clean the mcord networks && add one more kind
Change-Id: Ieed9d09094823d75f58a9c422934d8316a113a39
diff --git a/mcord/cleanup.sh b/mcord/cleanup.sh
index 704cacb..94ed427 100755
--- a/mcord/cleanup.sh
+++ b/mcord/cleanup.sh
@@ -31,6 +31,10 @@
cleanup_network mysite_vcpe-private
cleanup_network mysite_vsg-access
cleanup_network management
+cleanup_network lan_rru_network
+cleanup_network lan_3gpp_s5s8_pgw_network
+cleanup_network lan_3gpp_s1u_network
+cleanup_network lan_3gpp_s1mme_network
echo "Deleting networks"
# Delete all networks beginning with mysite_
diff --git a/mcord/make-vtn-external-yaml.sh b/mcord/make-vtn-external-yaml.sh
index 2bdc282..36c1eda 100644
--- a/mcord/make-vtn-external-yaml.sh
+++ b/mcord/make-vtn-external-yaml.sh
@@ -17,7 +17,7 @@
type: tosca.nodes.ONOSService
requirements:
properties:
- kind: onos
+ kind: CORD-Platform
view_url: /admin/onos/onosservice/\$id$/
no_container: true
rest_hostname: onos-cord
@@ -26,6 +26,7 @@
service#vtn:
type: tosca.nodes.VTNService
properties:
+ kind: CORD-Platform
view_url: /admin/vtn/vtnservice/\$id$/
privateGatewayMac: 00:00:00:00:00:01
localManagementIp: 10.102.83.2/24
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
deleted file mode 100644
index 734b794..0000000
--- a/mcord/vtn-external.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-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
-
- nova-compute-1:
- type: tosca.nodes.Node
-
- # VTN bridgeId field for node nova-compute-1
- nova-compute-1_bridgeId_tag:
- type: tosca.nodes.Tag
- properties:
- name: bridgeId
- value: of:0000000000000001
- requirements:
- - target:
- node: nova-compute-1
- relationship: tosca.relationships.TagsObject
- - service:
- node: service#ONOS_CORD
- relationship: tosca.relationships.MemberOfService
-
- # VTN dataPlaneIntf field for node nova-compute-1
- nova-compute-1_dataPlaneIntf_tag:
- type: tosca.nodes.Tag
- properties:
- name: dataPlaneIntf
- value: fabric
- requirements:
- - target:
- node: nova-compute-1
- relationship: tosca.relationships.TagsObject
- - service:
- node: service#ONOS_CORD
- relationship: tosca.relationships.MemberOfService
-
- # VTN dataPlaneIp field for node nova-compute-1
- nova-compute-1_dataPlaneIp_tag:
- type: tosca.nodes.Tag
- properties:
- name: dataPlaneIp
- value: 10.168.0.253/24
- requirements:
- - target:
- node: nova-compute-1
- relationship: tosca.relationships.TagsObject
- - service:
- node: service#ONOS_CORD
- relationship: tosca.relationships.MemberOfService
-
- 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