Merge "Update orchestrator (cloudify) version from 3.2 to 3.3"

diff --combined testcases/config_functest.yaml
index 442ed45,ab75ee3..dc33f07
--- 1/testcases/config_functest.yaml
--- 2/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@@ -30,7 -30,7 +30,7 @@@ general
          releng_branch:  master
          releng_commit:  latest
          rally_branch:   master
 -        rally_commit:   3011fa6ee2de2f373afe9d17d181ad7026cd8c20
 +        rally_commit:   2c34d1896a7a9f2955a2a09531a9c3eb3f88517b
          vims_test_branch:   stable
          vims_test_commit:   latest
          bgpvpn_branch:   master
@@@ -72,36 -72,32 +72,32 @@@ vIMS
      general:
          tenant_name: vIMS
          tenant_description: vIMS Functionality Testing
-         base_image_url: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-         base_image_name: ubuntu_14.04
+         images:
+             ubuntu:
+                 image_url: 'http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img'
+                 image_name: ubuntu_14.04
+             centos:
+                 image_url: 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1510.qcow2'
+                 image_name: centos_7
      cloudify:
          blueprint:
              url: https://github.com/boucherv-orange/cloudify-manager-blueprints.git
-             branch: "3.2-build"
-             file_name: "openstack-manager-blueprint.yaml"
+             branch: "3.3-build"
+         requierments:
+             ram_min: 3000
+             os_image: centos_7
          inputs:
              keystone_username: ""
              keystone_password: ""
              keystone_tenant_name: ""
              keystone_url: ""
-             manager_public_key_name: 'cloudify-manager'
-             agent_public_key_name: 'cloudify-agent'
+             manager_public_key_name: 'manager-kp'
+             agent_public_key_name: 'agent-kp'
              image_id: ""
-             flavor_id: "2"
+             flavor_id: "3"
              external_network_name: ""
-             use_existing_manager_keypair: false
-             use_existing_agent_keypair: false
-             manager_server_name: cloudify-management-server
-             manager_server_user: ubuntu
-             manager_security_group_name: cloudify-sg-manager
-             agents_security_group_name: cloudify-sg-agents
-             manager_private_key_path: ~/.ssh/cloudify-manager-kp.pem
-             agent_private_key_path: ~/.ssh/cloudify-agent-kp.pem
+             ssh_user: centos
              agents_user: ubuntu
-             nova_url: ""
-             neutron_url: ""
-             resources_prefix: ""
-         inputs_path: openstack/inputs.yaml
      clearwater:
          blueprint:
              file_name: 'openstack-blueprint.yaml'
@@@ -110,6 -106,9 +106,9 @@@
              url: 'https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git'
              branch: "stable"
          deployment-name: 'clearwater-opnfv'
+         requierments:
+             ram_min: 1700
+             os_image: ubuntu_14.04
          inputs:
              image_id: ''
              flavor_id: ''

diff --combined testcases/functest_utils.py
index 00a7b30,3276086..88c0085
--- 1/testcases/functest_utils.py
--- 2/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@@ -16,6 -16,7 +16,7 @@@ import subproces
  import sys
  import requests
  import json
+ import shutil
  from git import Repo
  
  
@@@ -235,19 -236,6 +236,19 @@@ def create_neutron_port(neutron_client
          return False
  
  
 +def update_neutron_port(neutron_client, port_id, device_owner):
 +    json_body = {'port': {
 +                 'device_owner': device_owner,
 +                 }}
 +    try:
 +        port = neutron_client.update_port(port=port_id,
 +                                          body=json_body)
 +        return port['port']['id']
 +    except:
 +        print "Error:", sys.exc_info()[0]
 +        return False
 +
 +
  def delete_neutron_port(neutron_client, port_id):
      try:
          neutron_client.delete_port(port_id)
@@@ -526,7 -514,7 +527,7 @@@ def download_url(url, dest_path)
          return False
  
      with open(dest, 'wb') as f:
-         f.write(response.read())
+         shutil.copyfileobj(response, f)
      return True