From 41f209f4573817a909a066f403a659ccee15868c Mon Sep 17 00:00:00 2001
From: gong yong sheng <gong.yongsheng@99cloud.net>
Date: Fri, 4 Nov 2016 16:09:10 +0800
Subject: [PATCH] Change network into net_mgmt

This patch will make the tosca template useful in tacker
installed by devstack directly.

Change-Id: Ifece7eff6c1aa4f189d51306a28f5706f9702748
Closes-bug: #1639163
---
 samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml            | 2 +-
 .../vm/infra_drivers/openstack/data/hot_scale_custom.yaml     | 2 +-
 .../unit/vm/infra_drivers/openstack/data/hot_tosca_alarm.yaml | 2 +-
 .../unit/vm/infra_drivers/openstack/data/tosca_alarm.yaml     | 4 ++--
 .../unit/vm/infra_drivers/openstack/data/tosca_scale.yaml     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
index 29d87d6eb..99645c5d8 100644
--- a/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
+++ b/samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
@@ -50,7 +50,7 @@ topology_template:
     VL1:
       type: tosca.nodes.nfv.VL
       properties:
-        network_name: private
+        network_name: net_mgmt
         vendor: Tacker
 
   policies:
diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml
index c809f2503..f135a83da 100644
--- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml
+++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_scale_custom.yaml
@@ -9,7 +9,7 @@ outputs:
 parameters: {}
 resources:
   CP1:
-    properties: {network: private, port_security_enabled: false}
+    properties: {network: net_mgmt, port_security_enabled: false}
     type: OS::Neutron::Port
   VDU1:
     properties:
diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm.yaml
index 255cd0f6b..4a65f5570 100644
--- a/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm.yaml
+++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/hot_tosca_alarm.yaml
@@ -20,7 +20,7 @@ resources:
       user_data_format: SOFTWARE_CONFIG
     type: OS::Nova::Server
   CP1:
-    properties: {network: private, port_security_enabled: false}
+    properties: {network: net_mgmt, port_security_enabled: false}
     type: OS::Neutron::Port
   VDU1_flavor:
     type: OS::Nova::Flavor
diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm.yaml
index 9c59132e1..450be7998 100644
--- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm.yaml
+++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_alarm.yaml
@@ -33,7 +33,7 @@ topology_template:
     VL1:
       type: tosca.nodes.nfv.VL
       properties:
-        network_name: private
+        network_name: net_mgmt
         vendor: Tacker
 
   policies:
@@ -53,4 +53,4 @@ topology_template:
                     method: average
                     comparison_operator: gt
                 action:
-                  resize_compute: ''
\ No newline at end of file
+                  resize_compute: ''
diff --git a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml
index 51ce0dacc..531b9fd2d 100644
--- a/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml
+++ b/tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml
@@ -29,7 +29,7 @@ topology_template:
     VL1:
       type: tosca.nodes.nfv.VL
       properties:
-        network_name: private
+        network_name: net_mgmt
         vendor: Tacker
 
   policies: