add neutron_port_ip NetworkParameter and add wan_network.
Change-Id: I28a3920814c16bcc36a0274e8f4b4a6518c34b00
diff --git a/common/tosca/fixtures.yaml b/common/tosca/fixtures.yaml
index 00da082..23c3382 100644
--- a/common/tosca/fixtures.yaml
+++ b/common/tosca/fixtures.yaml
@@ -33,6 +33,9 @@
neutron_port_name:
type: tosca.nodes.NetworkParameterType
+ neutron_port_ip:
+ type: tosca.nodes.NetworkParameterType
+
# ----------------------------------------------------------------------------
# Roles
# ----------------------------------------------------------------------------
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index 284aa6d..d08e936 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -220,11 +220,11 @@
required: false
default: New vSGW Tenant
description: Just a message
- image_name:
- type: string
- required: true
- default: default
- description: Name of VM image
+# image_name:
+# type: string
+# required: true
+# default: default
+# description: Name of VM image
topology_template:
node_templates:
@@ -447,6 +447,22 @@
node: mysite_mobile_net
relationship: tosca.relationships.ConnectsToSlice
+ wan_network:
+ type: tosca.nodes.network.Network.XOS
+ properties:
+ ip_version: 4
+ cidr: 102.0.0.0/24
+ requirements:
+ - network_template:
+ node: External
+ relationship: tosca.relationships.UsesNetworkTemplate
+ - owner:
+ node: mysite_mobile_net
+ relationship: tosca.relationships.MemberOfSlice
+ - slice:
+ node: mysite_mobile_net
+ relationship: tosca.relationships.ConnectsToSlice
+
mysite:
type: tosca.nodes.Site
@@ -547,6 +563,9 @@
- connection_to_shared_network:
node: shared_network
relationship: tosca.relationships.ConnectsToNetwork
+ - connection_to_wan_network:
+ node: wan_network
+ relationship: tosca.relationships.ConnectsToNetwork
properties:
network: noauto
@@ -606,13 +625,26 @@
relationship: tosca.relationships.ConnectsToNetwork
properties:
network: noauto
+# default_node: compute1
-
- tenant#vpgwctenant1:
+ tenant#vPGWU:
type: tosca.nodes.VPGWCTenant
properties:
display_message: just a message
- image_name: pgwc
+ image_name: pgwu
+ requirements:
+ - tenant:
+ node: vPGWC
+ relationship: tosca.relationships.MemberOfService
+ - dependency:
+ node: mysite_vpgwc_slice1
+ relationship: tosca.relationships.DependsOn
+
+ tenant#vPGWC:
+ type: tosca.nodes.VPGWCTenant
+ properties:
+ display_message: just a message
+ image_name: trusty-server-multi-nic
requirements:
- tenant:
node: vPGWC