Fixes broken Makefile as well as fixes management network for single-node-pod (development) environments.
When Makefiles were refactored as part of https://gerrit.opencord.org/gitweb?p=service-profile.git;a=commitdiff;h=3670f448a2d287e5471eeb53f20fc9c4832f19b0
include $(COMMON_DIR)/Makefile should have been included in mcord's Makefile.
Also xos is built around the rack server's management network. Including the default to work for single-node-pod mcord development environments.
Change-Id: Ic8482bb3e55f0cfceea0f37eb61514f6bf58696d
diff --git a/mcord/Makefile b/mcord/Makefile
index c4a1101..3c340ae 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -8,6 +8,8 @@
DOCKER_PROJECT ?= mcord
BOOTSTRAP_PROJECT ?= mcordbs
+include $(COMMON_DIR)/Makefile
+
xos: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding podconfig
onboarding:
diff --git a/mcord/cleanup.sh b/mcord/cleanup.sh
index d60ead1..94ed427 100755
--- a/mcord/cleanup.sh
+++ b/mcord/cleanup.sh
@@ -30,7 +30,7 @@
cleanup_network wan_network
cleanup_network mysite_vcpe-private
cleanup_network mysite_vsg-access
-#cleanup_network management
+cleanup_network management
cleanup_network lan_rru_network
cleanup_network lan_3gpp_s5s8_pgw_network
cleanup_network lan_3gpp_s1u_network
@@ -49,6 +49,6 @@
neutron net-delete public_network || true
neutron net-delete hpc_client_network || true
neutron net-delete ceilometer_network || true
-#neutron net-delete management || true
+neutron net-delete management || true
neutron net-delete mysite_vsg-access || true
neutron net-delete exampleservice-public || true
diff --git a/mcord/mgmt-net.yaml b/mcord/mgmt-net.yaml
new file mode 120000
index 0000000..d684fea
--- /dev/null
+++ b/mcord/mgmt-net.yaml
@@ -0,0 +1 @@
+mgmt-net.yaml.cloudlab
\ No newline at end of file
diff --git a/mcord/mgmt-net.yaml.cloudlab b/mcord/mgmt-net.yaml.cloudlab
new file mode 100644
index 0000000..2bd0173
--- /dev/null
+++ b/mcord/mgmt-net.yaml.cloudlab
@@ -0,0 +1,40 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Set up management network for CORD POD
+imports:
+ - custom_types/xos.yaml
+
+topology_template:
+ node_templates:
+
+ management_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ visibility: private
+ translation: none
+
+ management:
+ type: tosca.nodes.network.Network
+ properties:
+ ip_version: 4
+ cidr: 172.27.0.0/24
+ requirements:
+ - network_template:
+ node: management_template
+ relationship: tosca.relationships.UsesNetworkTemplate
+ - owner:
+ node: mysite_management
+ relationship: tosca.relationships.MemberOfSlice
+
+ mysite:
+ type: tosca.nodes.Site
+
+ mysite_management:
+ description: This slice exists solely to own the management network
+ type: tosca.nodes.Slice
+ properties:
+ network: noauto
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
diff --git a/mcord/mgmt-net.yaml b/mcord/mgmt-net.yaml.rack
similarity index 100%
rename from mcord/mgmt-net.yaml
rename to mcord/mgmt-net.yaml.rack
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
new file mode 120000
index 0000000..e2f4f95
--- /dev/null
+++ b/mcord/vtn-external.yaml
@@ -0,0 +1 @@
+vtn-external.yaml.cloudlab
\ No newline at end of file
diff --git a/mcord/vtn-external.yaml.cloudlab b/mcord/vtn-external.yaml.cloudlab
new file mode 100644
index 0000000..ace73c5
--- /dev/null
+++ b/mcord/vtn-external.yaml.cloudlab
@@ -0,0 +1,94 @@
+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: CORD-Platform
+ view_url: /admin/onos/onosservice/$id$/
+ no_container: true
+ rest_hostname: onos-cord
+ replaces: service_ONOS_CORD
+
+ service#vtn:
+ type: tosca.nodes.VTNService
+ properties:
+ kind: CORD-Platform
+ view_url: /admin/vtn/vtnservice/$id$/
+ privateGatewayMac: 00:00:00:00:00:01
+ localManagementIp: 172.27.0.1/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
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml.rack
similarity index 100%
rename from mcord/vtn-external.yaml
rename to mcord/vtn-external.yaml.rack