Assign public interface to vFW in OpenStack

Change-Id: I6a7c640edbca8a4d726d7bb2358924f07c004b9e
Signed-off-by: Marco Platania <platania@research.att.com>

5 files changed, 59 insertions, 68 deletions

diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 375d7816..584ca46f 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -348,7 +348,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace:
           template: base-dns-server
           params:
@@ -427,7 +427,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace:
           template: base-aai
           params:
@@ -492,7 +492,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace:
           template: base-mso
           params:
@@ -567,7 +567,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-message-router
           params:
@@ -628,7 +628,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace: 
           template: base-robot
           params:
@@ -699,7 +699,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-vid
           params:
@@ -762,7 +762,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-sdnc
           params:
@@ -831,7 +831,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-sdc
           params:
@@ -903,7 +903,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-portal
           params:
@@ -968,7 +968,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-dcae-controller
           params:
@@ -1093,7 +1093,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-policy
           params:
@@ -1158,7 +1158,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-appc
           params:
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 977da801..659f94c9 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -418,7 +418,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace:
           template: base-dns-server
           params:
@@ -498,7 +498,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace:
           template: base-aai
           params:
@@ -564,7 +564,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace:
           template: base-mso
           params:
@@ -640,7 +640,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-message-router
           params:
@@ -702,7 +702,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace: 
           template: base-robot
           params:
@@ -774,7 +774,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-vid
           params:
@@ -838,7 +838,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-sdnc
           params:
@@ -908,7 +908,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-sdc
           params:
@@ -981,7 +981,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-portal
           params:
@@ -1047,7 +1047,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-dcae-controller
           params:
@@ -1185,7 +1185,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-policy
           params:
@@ -1251,7 +1251,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-appc
           params:
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index b0a155d4..c19f6f55 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -325,7 +325,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace:
           template: base-dns-server
           params:
@@ -399,7 +399,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace:
           template: base-aai
           params:
@@ -463,7 +463,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace:
           template: base-mso
           params:
@@ -537,7 +537,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-message-router
           params:
@@ -597,7 +597,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace: 
           template: base-robot
           params:
@@ -667,7 +667,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-vid
           params:
@@ -729,7 +729,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-sdnc
           params:
@@ -866,7 +866,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-portal
           params:
@@ -928,7 +928,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-dcae-controller
           params:
@@ -1050,7 +1050,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-policy
           params:
@@ -1112,7 +1112,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-appc
           params:
diff --git a/heat/OpenECOMP/onap_rackspace.yaml b/heat/OpenECOMP/onap_rackspace.yaml
index de482541..4c27fad7 100644
--- a/heat/OpenECOMP/onap_rackspace.yaml
+++ b/heat/OpenECOMP/onap_rackspace.yaml
@@ -214,7 +214,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 4 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-dns-server
           params:
@@ -265,7 +265,7 @@ resources:
     type: OS::Nova::Server
     properties:
       flavor: 15 GB Compute v1
-      name: 
+      name:
         str_replace:
           template: base-aai
           params:
@@ -323,7 +323,7 @@ resources:
     properties:
       image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
       flavor: 4 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-mso
           params:
@@ -386,7 +386,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 15 GB I/O v1
-      name: 
+      name:
         str_replace:
           template: base-message-router
           params:
@@ -439,7 +439,7 @@ resources:
     properties:
       image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
       flavor: 2 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-robot
           params:
@@ -504,7 +504,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 2 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-vid
           params:
@@ -559,7 +559,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 4 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-sdnc
           params:
@@ -635,7 +635,7 @@ resources:
     type: OS::Nova::Server
     properties:
       flavor: 15 GB Compute v1
-      name: 
+      name:
         str_replace:
           template: base-sdc
           params:
@@ -703,7 +703,7 @@ resources:
     type: OS::Nova::Server
     properties:
       flavor: 15 GB Memory v1
-      name: 
+      name:
         str_replace:
           template: base-portal
           params:
@@ -760,7 +760,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 8 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-dcae-controller
           params:
@@ -870,7 +870,7 @@ resources:
     type: OS::Nova::Server
     properties:
       flavor: 15 GB Compute v1
-      name: 
+      name:
         str_replace:
           template: base-policy
           params:
@@ -928,7 +928,7 @@ resources:
     properties:
       image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
       flavor: 4 GB General Purpose v1
-      name: 
+      name:
         str_replace:
           template: base-appc
           params:
diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
index 6ef33cca..9a186722 100644
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw_openstack.yaml
@@ -227,12 +227,6 @@ resources:
       network: { get_param: onap_private_net_id }

       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vfw_private_ip_2 }}]

 

-  vfw_floating_ip:

-    type: OS::Neutron::FloatingIP

-    properties:

-      floating_network_id: { get_param: public_net_id }

-      port_id: { get_resource: vfw_private_2_port }

-

   vfw_0:

     type: OS::Nova::Server

     properties:

@@ -241,9 +235,10 @@ resources:
       name: { get_param: vfw_name_0 }

       key_name: { get_resource: my_keypair }

       networks:

-        - port: { get_resource: vfw_private_2_port }

+        - network: { get_param: public_net_id }

         - port: { get_resource: vfw_private_0_port }

         - port: { get_resource: vfw_private_1_port }

+        - port: { get_resource: vfw_private_2_port }

       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}

       user_data_format: RAW

       user_data:

@@ -257,6 +252,7 @@ resources:
             __install_script_version__ : { get_param: install_script_version }

             __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }

             __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }

+            __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -271,6 +267,7 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt

             echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt

             echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt

+            echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script

@@ -281,12 +278,6 @@ resources:
 

 

   # Virtual Packet Generator instantiation

-  vpg_floating_ip:

-    type: OS::Neutron::FloatingIP

-    properties:

-      floating_network_id: { get_param: public_net_id }

-      port_id: { get_resource: vpg_private_1_port }

-

   vpg_private_0_port:

     type: OS::Neutron::Port

     properties:

@@ -307,8 +298,9 @@ resources:
       name: { get_param: vpg_name_0 }

       key_name: { get_resource: my_keypair }

       networks:

-        - port: { get_resource: vpg_private_1_port }

+        - network: { get_param: public_net_id }

         - port: { get_resource: vpg_private_0_port }

+        - port: { get_resource: vpg_private_1_port }

       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}

       user_data_format: RAW

       user_data:

@@ -322,6 +314,7 @@ resources:
             __demo_artifacts_version__ : { get_param: demo_artifacts_version }

             __install_script_version__ : { get_param: install_script_version }

             __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }

+            __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -336,6 +329,7 @@ resources:
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt

             echo "__install_script_version__" > /opt/config/install_script_version.txt

             echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt

+            echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script

@@ -358,12 +352,6 @@ resources:
       network: { get_param: onap_private_net_id }

       fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vsn_private_ip_1 }}]

 

-  vsn_floating_ip:

-    type: OS::Neutron::FloatingIP

-    properties:

-      floating_network_id: { get_param: public_net_id }

-      port_id: { get_resource: vsn_private_1_port }

-

   vsn_0:

     type: OS::Nova::Server

     properties:

@@ -372,8 +360,9 @@ resources:
       name: { get_param: vsn_name_0 }

       key_name: { get_resource: my_keypair }

       networks:

-        - port: { get_resource: vsn_private_1_port }

+        - network: { get_param: public_net_id }

         - port: { get_resource: vsn_private_0_port }

+        - port: { get_resource: vsn_private_1_port }

       metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}

       user_data_format: RAW

       user_data:

@@ -385,6 +374,7 @@ resources:
             __repo_url_artifacts__ : { get_param: repo_url_artifacts }

             __install_script_version__ : { get_param: install_script_version }

             __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }

+            __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -396,6 +386,7 @@ resources:
             echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt

             echo "__install_script_version__" > /opt/config/install_script_version.txt

             echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt

+            echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script