Merge pull request #245 from cloudify-cosmo/2.9.1-build

2.9.1 build

Author: EarthmanT

.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+
+checkout:
+  post:
+    - >
+      if [ -n "$CI_PULL_REQUEST" ]; then
+        PR_ID=${CI_PULL_REQUEST##*/}
+        git fetch origin +refs/pull/$PR_ID/merge:
+        git checkout -qf FETCH_HEAD
+      fi
+
+jobs:
+
+  unittests:
+    docker:
+      - image: circleci/python:2.7.15-stretch
+    steps:
+      - checkout
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user tox
+      - run: /home/circleci/.local/bin/tox -e flake8
+      - run: /home/circleci/.local/bin/tox -e py27
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - unittests

.travis.yml

@@ -1,3 +1,6 @@
+2.9.1:
+    - Fix a bug introduced in 2.7.6 when setting fixed_ip via args.
+    - Update CircleCI v2.
 2.9.0:
     - Add Support for backup/restore actions.
     - Fix bug in server-port-floating-ip handling.

CHANGELOG.txt

@@ -53,6 +53,15 @@ node_templates:
         target: private_subnet
       - type: cloudify.openstack.port_connected_to_security_group
         target: security_group
+    # interfaces:
+    #   cloudify.interfaces.lifecycle:
+    #     create:
+    #       inputs:
+    #         args:
+    #           name: os_port
+    #           fixed_ips:
+    #           - ip_address: { get_input: fixed_ip }
+    #             subnet_id: { get_attribute: [ private_subnet, external_id ] }
 
   security_group:
     type: cloudify.openstack.nodes.SecurityGroup

blueprints/port-fixed-ip.yaml

@@ -286,9 +286,18 @@ def _handle_fixed_ips(port):
     if subnet_id:
         fixed_ips_element['subnet_id'] = subnet_id
 
+    fixed_ips = port.get(
+        'fixed_ips',
+        [] if not fixed_ips_element else [fixed_ips_element])
+    addresses = [ip.get('ip_address') for ip in fixed_ips]
+    subnets = [net.get('subnet_id') for net in fixed_ips]
     # applying fixed ip parameter, if available
-    if fixed_ips_element:
-        port['fixed_ips'] = [fixed_ips_element]
+    if fixed_ips_element and not \
+            (fixed_ips_element.get('ip_address') in addresses or
+             fixed_ips_element.get('subnet_id') in subnets):
+        fixed_ips.append(fixed_ips_element)
+    if fixed_ips:
+        port['fixed_ips'] = fixed_ips
 
 
 def _handle_security_groups(port):

circle.yml

@@ -5,9 +5,9 @@
 plugins:
   openstack:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/2.9.0.zip
+    source: https://github.com/cloudify-cosmo/cloudify-openstack-plugin/archive/2.9.1.zip
     package_name: cloudify-openstack-plugin
-    package_version: '2.9.0'
+    package_version: '2.9.1'
 
 data_types:
   cloudify.openstack.types.custom_configuration:

neutron_plugin/port.py

@@ -19,7 +19,7 @@
 setup(
     zip_safe=True,
     name='cloudify-openstack-plugin',
-    version='2.9.0',
+    version='2.9.1',
     author='Cloudify',
     author_email='[email protected]',
     packages=[