Merge pull request #306 from cloudify-cosmo/CY-1463-fix-server-ip-for-multiple-ports

EarthmanT · web-flow · commit 4f4684ccb447 · 2019-07-17T16:26:28.000+03:00
CY-1463: Fix major issue for port/networks ordering attached to serve…
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+3.2.2:
+    - Fix major issue with ports/network ordering connected server instance
 3.2.1:
     - Expose external resource property as runtime property for external resource
     - Update compat module for external resources
diff --git a/examples/2.x/boot-volumes.yaml b/examples/2.x/boot-volumes.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 
 inputs:
diff --git a/examples/2.x/external_missing_network_connection.yaml b/examples/2.x/external_missing_network_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/external_network_connection.yaml b/examples/2.x/external_network_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/flavor.yaml b/examples/2.x/flavor.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
   openstack_username:
diff --git a/examples/2.x/host_aggregate.yaml b/examples/2.x/host_aggregate.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
   openstack_username:
diff --git a/examples/2.x/image.yaml b/examples/2.x/image.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/keypair.yaml b/examples/2.x/keypair.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
   openstack_username:
diff --git a/examples/2.x/network_connection.yaml b/examples/2.x/network_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/network_rbac.yaml b/examples/2.x/network_rbac.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
   openstack_username:
diff --git a/examples/2.x/project.yaml b/examples/2.x/project.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/router_1.yaml b/examples/2.x/router_1.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/router_2.yaml b/examples/2.x/router_2.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/router_3.yaml b/examples/2.x/router_3.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/router_4.yaml b/examples/2.x/router_4.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/router_connection.yaml b/examples/2.x/router_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/routes.yaml b/examples/2.x/routes.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/security_group_1.yaml b/examples/2.x/security_group_1.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/security_group_2.yaml b/examples/2.x/security_group_2.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/security_group_3.yaml b/examples/2.x/security_group_3.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/security_group_4.yaml b/examples/2.x/security_group_4.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/server.yaml b/examples/2.x/server.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
@@ -23,7 +23,7 @@ inputs:
     default: { get_secret: region }
 
   external_network_name:
-    default: { get_input: external_network_name }
+    type: string
 
   network_id:
     type: string
diff --git a/examples/2.x/server_floating_ip_connection.yaml b/examples/2.x/server_floating_ip_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/server_group.yaml b/examples/2.x/server_group.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/server_security_group_connection.yaml b/examples/2.x/server_security_group_connection.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/user.yaml b/examples/2.x/user.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/examples/2.x/volume.yaml b/examples/2.x/volume.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
-  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.1/compat.yaml
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/3.2.2/compat.yaml
 
 inputs:
 
diff --git a/openstack_plugin/resources/compute/server.py b/openstack_plugin/resources/compute/server.py
diff --git a/openstack_plugin/tests/compute/test_server.py b/openstack_plugin/tests/compute/test_server.py
diff --git a/openstack_plugin/utils.py b/openstack_plugin/utils.py
diff --git a/plugin.yaml b/plugin.yaml
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+3.2.2:`
	`2`	`+ - Fix major issue with ports/network ordering connected server instance`
`1`	`3`	`3.2.1:`
`2`	`4`	`- Expose external resource property as runtime property for external resource`
`3`	`5`	`- Update compat module for external resources`