Created flat network
Change-Id: I38ea13893569403fcf4ea5576250e314055ed85f
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index db55ef9..51e9fb0 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -24,6 +24,7 @@
- shared-net.yaml
- wan-net.yaml
- vsg-net.yaml
+ - flat-net.yaml
- mcord-services.yaml
- xos-gui-extensions.yml
diff --git a/roles/cord-profile/templates/flat-net.yaml.j2 b/roles/cord-profile/templates/flat-net.yaml.j2
new file mode 100644
index 0000000..bd6f5c8
--- /dev/null
+++ b/roles/cord-profile/templates/flat-net.yaml.j2
@@ -0,0 +1,45 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - custom_types/xos.yaml
+
+description: flat network config, generated by platform-install
+
+topology_template:
+ node_templates:
+
+# site, fully created in deployment.yaml
+ {{ site_name }}:
+ type: tosca.nodes.Site
+
+# flat network
+ flat_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ visibility: private
+ translation: none
+ vtn_kind: FLAT
+
+ flat_network:
+ type: tosca.nodes.network.Network
+ properties:
+ ip_version: 4
+ cidr: 103.0.0.0/24
+ requirements:
+ - network_template:
+ node: flat_template
+ relationship: tosca.relationships.UsesNetworkTemplate
+ - owner:
+ node: {{ site_name }}_flat
+ relationship: tosca.relationships.MemberOfSlice
+
+ {{ site_name }}_flat:
+ description: This slice exists solely to own the flat network
+ type: tosca.nodes.Slice
+ properties:
+ network: noauto
+ requirements:
+ - site:
+ node: {{ site_name }}
+ relationship: tosca.relationships.MemberOfSite
+
diff --git a/roles/cord-profile/templates/mcord-services.yaml.j2 b/roles/cord-profile/templates/mcord-services.yaml.j2
index 30aabac..92e7fa7 100644
--- a/roles/cord-profile/templates/mcord-services.yaml.j2
+++ b/roles/cord-profile/templates/mcord-services.yaml.j2
@@ -20,7 +20,7 @@
# site, image, fully created in deployment.yaml
{{ site_name }}:
type: tosca.nodes.Site
-
+
m1.small:
type: tosca.nodes.Flavor
m1.large:
@@ -57,6 +57,7 @@
no-create: true
no-delete: true
no-update: true
+
# wan_network for vPGWU and its upstream connectivity, fully created in wan-net.yaml
wan_network:
type: tosca.nodes.network.Network.XOS
@@ -64,6 +65,7 @@
no-create: true
no-delete: true
no-update: true
+
# VLAN networks for RRH and vBBU, fully created in vsg-net.yaml
vsg_network:
type: tosca.nodes.network.Network.XOS
@@ -72,6 +74,14 @@
no-delete: true
no-update: true
+# flat network for vMME, vSGWC, vSGWU, to connect to RRU, fully created in flat-net.yaml
+ flat_network:
+ type: tosca.nodes.network.Network.XOS
+ properties:
+ no-create: true
+ no-delete: true
+ no-update: true
+
# ONOS_CORD, fully created in vtn.yaml
service#ONOS_CORD:
type: tosca.nodes.ONOSService
@@ -98,7 +108,7 @@
private_key_fn: /opt/xos/services/vbbu/keys/mcord_rsa
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
+
service#vhss:
type: tosca.nodes.VHSSService
properties:
@@ -108,7 +118,7 @@
private_key_fn: /opt/xos/services/vhss/keys/mcord_rsa
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
+
service#vmme:
type: tosca.nodes.VMMEService
properties:
@@ -118,7 +128,7 @@
private_key_fn: /opt/xos/services/vmme/keys/mcord_rsa
artifacts:
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
-
+
service#vmm:
type: tosca.nodes.VMMService
properties:
@@ -259,6 +269,9 @@
- connection_to_shared_network:
node: shared_network
relationship: tosca.relationships.ConnectsToNetwork
+ - connection_to_flat_network:
+ node: flat_network
+ relationship: tosca.relationships.ConnectsToNetwork
mysite_vMM_slice:
description: vMM Service Slice
@@ -334,6 +347,9 @@
- connection_to_shared_network:
node: shared_network
relationship: tosca.relationships.ConnectsToNetwork
+ - connection_to_flat_network:
+ node: flat_network
+ relationship: tosca.relationships.ConnectsToNetwork
mysite_vSGWU_slice:
description: vSGWU Service Slice
@@ -359,6 +375,9 @@
- connection_to_shared_network:
node: shared_network
relationship: tosca.relationships.ConnectsToNetwork
+ - connection_to_flat_network:
+ node: flat_network
+ relationship: tosca.relationships.ConnectsToNetwork
mysite_vPGWC_slice:
description: vPGWC Service Slice
@@ -412,3 +431,4 @@
- connection_to_wan_network:
node: wan_network
relationship: tosca.relationships.ConnectsToNetwork
+