Adding Security gateway testing

Using now .test files describing the test to be executed.
Also desribed in the README file how to deal with SRIOV ports.

Change-Id: I3eb1551d7f205fef3fa1914bc6959c2126d63425
Signed-off-by: Provoost <luc.provoost@intel.com>

1 files changed, 85 insertions, 41 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
index 6f3c1cd4..63778c1c 100644
--- a/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
+++ b/VNFs/DPPD-PROX/helper-scripts/openstackrapid/rapid.yaml
@@ -37,7 +37,7 @@ parameters:
     label: Private network name or ID
     description: Network to attach instance to.
     default: dataplane-network
-  admin_network:
+  internal_network:
     type: string
     label: Private network name or ID
     description: Network to attach instance to.
@@ -53,24 +53,24 @@ parameters:
     default: nova
 
 resources:
-  sut_admin_port:
+  vm1_admin_port:
      type: OS::Neutron::Port
      properties:
-       network: {get_param: admin_network}
+       network: {get_param: internal_network}
        security_groups:
          - default
-  sut_dataplane_port:
+  vm1_dataplane_port:
      type: OS::Neutron::Port
      properties:
        network: {get_param: dataplane_network}
        security_groups:
          - default
-  sut_floating_ip:
+  vm1_floating_ip:
      type: OS::Neutron::FloatingIP
      properties:
        floating_network: {get_param: floating_network}
-       port_id: {get_resource: sut_admin_port}
-  sut:
+       port_id: {get_resource: vm1_admin_port}
+  vm1:
     type: OS::Nova::Server
     properties:
       availability_zone: { get_param: availability_zone }
@@ -80,26 +80,26 @@ resources:
       image: { get_param: image }
       flavor: { get_param: flavor }
       networks:
-        - port: {get_resource: sut_admin_port}
-        - port: {get_resource: sut_dataplane_port}
-  gen_admin_port:
+        - port: {get_resource: vm1_admin_port}
+        - port: {get_resource: vm1_dataplane_port}
+  vm2_admin_port:
      type: OS::Neutron::Port
      properties:
-       network: {get_param: admin_network}
+       network: {get_param: internal_network}
        security_groups:
          - default
-  gen_dataplane_port:
+  vm2_dataplane_port:
      type: OS::Neutron::Port
      properties:
        network: {get_param: dataplane_network}
        security_groups:
          - default
-  gen_floating_ip:
+  vm2_floating_ip:
      type: OS::Neutron::FloatingIP
      properties:
        floating_network: {get_param: floating_network}
-       port_id: {get_resource: gen_admin_port}
-  gen:
+       port_id: {get_resource: vm2_admin_port}
+  vm2:
     type: OS::Nova::Server
     properties:
       availability_zone: { get_param: availability_zone }
@@ -109,31 +109,75 @@ resources:
       image: { get_param: image }
       flavor: { get_param: flavor }
       networks:
-        - port: {get_resource: gen_admin_port}
-        - port: {get_resource: gen_dataplane_port}
+        - port: {get_resource: vm2_admin_port}
+        - port: {get_resource: vm2_dataplane_port}
+#  vm3_admin_port:
+#     type: OS::Neutron::Port
+#     properties:
+#       network: {get_param: internal_network}
+#       security_groups:
+#         - default
+#  vm3_dataplane_port:
+#     type: OS::Neutron::Port
+#     properties:
+#       network: {get_param: dataplane_network}
+#       security_groups:
+#         - default
+#  vm3_floating_ip:
+#     type: OS::Neutron::FloatingIP
+#     properties:
+#       floating_network: {get_param: floating_network}
+#       port_id: {get_resource: vm3_admin_port}
+#  vm3:
+#    type: OS::Nova::Server
+#    properties:
+#      availability_zone: { get_param: availability_zone }
+#      user_data:
+#        get_file: prox_user_data.sh
+#      key_name: { get_param: key }
+#      image: { get_param: image }
+#      flavor: { get_param: flavor }
+#      networks:
+#        - port: {get_resource: vm3_admin_port}
+#        - port: {get_resource: vm3_dataplane_port}
 
 outputs:
-  sut_private_ip:
-    description: IP address of the sut admin port
-    value: { get_attr: [sut_admin_port, fixed_ips, 0, ip_address] }
-  sut_public_ip:
-    description: Floating IP address of sut in public network
-    value: { get_attr: [ sut_floating_ip, floating_ip_address ] }
-  sut_dataplane_ip:
-    description: IP address of sut dataplane port
-    value: { get_attr: [sut_dataplane_port, fixed_ips, 0, ip_address] }
-  sut_dataplane_mac:
-    description: The MAC address of the sut dataplane port
-    value: { get_attr: [sut_dataplane_port, mac_address] }
-  gen_private_ip:
-    description: IP address of the gen admin port
-    value: { get_attr: [gen_admin_port, fixed_ips, 0, ip_address] }
-  gen_public_ip:
-    description: Floating IP address of gen in public network
-    value: { get_attr: [ gen_floating_ip, floating_ip_address ] }
-  gen_dataplane_ip:
-    description: IP address of gen dataplane port
-    value: { get_attr: [gen_dataplane_port, fixed_ips, 0, ip_address] }
-  gen_dataplane_mac:
-    description: The MAC address of the gen dataplane port
-    value: { get_attr: [gen_dataplane_port, mac_address] }
+  total_number_of_VMs:
+    description: Number of VMs created by this stack
+    value: 2
+  vm1_private_ip:
+    description: IP address ofVM1 admin port
+    value: { get_attr: [vm1_admin_port, fixed_ips, 0, ip_address] }
+  vm1_public_ip:
+    description: Floating IP address of VM1 in public network
+    value: { get_attr: [ vm1_floating_ip, floating_ip_address ] }
+  vm1_dataplane_ip:
+    description: IP address of VM1 dataplane port
+    value: { get_attr: [vm1_dataplane_port, fixed_ips, 0, ip_address] }
+  vm1_dataplane_mac:
+    description: The MAC address of VM1 dataplane port
+    value: { get_attr: [vm1_dataplane_port, mac_address] }
+  vm2_private_ip:
+    description: IP address of the VM2 admin port
+    value: { get_attr: [vm2_admin_port, fixed_ips, 0, ip_address] }
+  vm2_public_ip:
+    description: Floating IP address of VM2 in public network
+    value: { get_attr: [ vm2_floating_ip, floating_ip_address ] }
+  vm2_dataplane_ip:
+    description: IP address of VM2 dataplane port
+    value: { get_attr: [vm2_dataplane_port, fixed_ips, 0, ip_address] }
+  vm2_dataplane_mac:
+    description: The MAC address of VM2 dataplane port
+    value: { get_attr: [vm2_dataplane_port, mac_address] }
+#  vm3_private_ip:
+#    description: IP address of the VM3 admin port
+#    value: { get_attr: [vm3_admin_port, fixed_ips, 0, ip_address] }
+#  vm3_public_ip:
+#    description: Floating IP address of VM3 in public network
+#    value: { get_attr: [ vm3_floating_ip, floating_ip_address ] }
+#  vm3_dataplane_ip:
+#    description: IP address of VM3 dataplane port
+#    value: { get_attr: [vm3_dataplane_port, fixed_ips, 0, ip_address] }
+#  vm3_dataplane_mac:
+#    description: The MAC address of VM3 dataplane port
+#    value: { get_attr: [vm3_dataplane_port, mac_address] }