[VVP] udpating scripts for casablanca 2

[vvp/validation-scripts.git] / ice_validator / tests / fixtures / test_port_resource_ids / pass / valid_template.yaml

diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
index dd5d768..504fbdc 100644 (file)
--- a/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -94,7 +94,10 @@ parameters:
 
   int_vpnnet_net_id:
     type: string
-    description: network id for the internal network vpnnet 
+    description: network id for the internal network vpnnet
+  int_oam_net_name:
+    type: string
+    description: name for the OAM network to be created in the resources section
 
 resources:
 
@@ -105,8 +108,8 @@ resources:
       name: { get_param: [admin_names, 0]  }
       flavor: { get_param: admin_flavor_name}
       networks:
-        - port: { get_resource: admin_0_exnet_0_port }
-        - port: { get_resource: admin_0_int_vpnnet_0_port }
+        - port: { get_resource: admin_0_exnet_port_0 }
+        - port: { get_resource: admin_0_int_vpnnet_port_0 }
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
@@ -119,13 +122,25 @@ resources:
       name: { get_param: [admin_names, 1]  }
       flavor: { get_param: admin_flavor_name}
       networks:
-        - port: { get_resource: ADMIN_1_EXTNET_0_PORT }
-        - port: { get_resource: admin_1_extnet_1_port }
+        - port: { get_resource: ADMIN_1_EXTNET_PORT_0 }
+        - port: { get_resource: admin_1_extnet_port_1 }
       metadata:
         vnf_name: { get_param: vnf_name }
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
 
+  admin_server_2:
+    type: OS::Nova::Server
+    properties:
+      availability_zone: { get_param: availability_zone_0 }
+      name: { get_param: [admin_names, 2]  }
+      flavor: { get_param: admin_flavor_name}
+      networks:
+        - port: { get_resource: admin_2_int_vpnnet_port_0 }
+      metadata:
+        vnf_name: { get_param: vnf_name }
+        vnf_id: { get_param: vnf_id }
+        vf_module_id: { get_param: vf_module_id }
   lb_server_0:
     type: OS::Nova::Server
     properties:
@@ -137,22 +152,35 @@ resources:
         vnf_id: { get_param: vnf_id }
         vf_module_id: { get_param: vf_module_id }
 
-  admin_0_exnet_0_port:
+  admin_0_exnet_port_0:
       type: OS::Neutron::Port
       properties:
         network: { get_param: exnet_net_name }
 
-  admin_0_int_vpnnet_0_port:
+  admin_0_int_vpnnet_port_0:
       type: OS::Neutron::Port
       properties:
           network: { get_param: int_vpnnet_net_id }
 
-  ADMIN_1_EXTNET_0_PORT:
+  ADMIN_1_EXTNET_PORT_0:
       type: OS::Neutron::Port
       properties:
         network: { get_param: extnet_net_name }
 
-  admin_1_extnet_1_port:
+  admin_1_extnet_port_1:
       type: OS::Neutron::Port
       properties:
-        network: { get_param: extnet_net_id }
\ No newline at end of file
+        network: { get_param: extnet_net_id }
+
+  int_oam_net:
+        type: OS::Neutron::Net
+        properties:
+          name: { get_param: int_oam_net_name }
+
+  admin_2_int_vpnnet_port_0:
+       type: OS::Neutron::Port
+       properties:
+         network: { get_resource: int_oam_net }
+         fixed_ips:
+            - ip_address: { get_param: [db_1_int_vpnnet_ips, 0] }
+            - ip_address: { get_param: [db_1_int_vpnnet_ips, 1] }