Merge pull request #35 from cloudify-examples/update-azure-add-monitoring-44

update 4.4

Author: EarthmanT

.circleci/config.yml

@@ -40,9 +40,6 @@ jobs:
       - run:
           name: install test requirements
           command: pip install nose https://github.com/cloudify-incubator/cloudify-awssdk-plugin/archive/2.3.4.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
-      - run:
-          name: test 4.3.2
-          command: nosetests -s tests/test_aws.py:TestAWS432
       - run:
           name: test 4.4.0
           command: nosetests -s tests/test_aws.py:TestAWS440
@@ -76,9 +73,6 @@ jobs:
       - run:
           name: install test requirements
           command: pip install nose https://github.com/cloudify-incubator/cloudify-azure-plugin/archive/1.7.2.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
-      - run:
-          name: test 4.3.2
-          command: nosetests -s tests/test_azure.py:TestAzure432
       - run:
           name: test 4.4.0
           command: nosetests -s tests/test_azure.py:TestAzure440
@@ -112,9 +106,6 @@ jobs:
       - run:
           name: install test requirements
           command: pip install nose https://github.com/cloudify-cosmo/cloudify-gcp-plugin/archive/1.4.3.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
-      - run:
-          name: test 4.3.2
-          command: nosetests -s tests/test_gcp.py:TestGCP432
       - run:
           name: test 4.4.0
           command: nosetests -s tests/test_gcp.py:TestGCP440

azure.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
-  - http://www.getcloudify.org/spec/azure-plugin/1.7.3/plugin.yaml
+  - http://www.getcloudify.org/spec/azure-plugin/1.8.0/plugin.yaml
   - http://www.getcloudify.org/spec/utilities-plugin/1.9.0/plugin.yaml
   - http://www.getcloudify.org/spec/fabric-plugin/1.5.1/plugin.yaml
   - imports/manager-configuration.yaml

imports/manager-configuration.yaml

@@ -7,7 +7,7 @@ inputs:
   rpm:
     description: >
       If inputs.bootstrap is false, this is the CLI RPM to install and bootstrap with.
-    default: http://repository.cloudifysource.org/cloudify/4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm
+    default: http://repository.cloudifysource.org/cloudify/4.4.0/ga-release/cloudify-manager-install-4.4ga.rpm
 
   blueprints:
     default:

scripts/manager/tasks.py

@@ -28,6 +28,14 @@ def update_config(private, public, _config_path):
 
     SED = "sed -i 's|{0}|{1}|g' {2}"
 
+    old_monitoring = "    skip_installation: true"
+    new_monitoring = "    skip_installation: false"
+
+    try:
+        sudo(SED.format(old_monitoring, new_monitoring, _config_path))
+    except Exception as e:
+        raise NonRecoverableError(str(e))
+
     old_sanity = "  skip_sanity: false"
     new_sanity = "  skip_sanity: true"
 

tests/test_aws.py

@@ -76,28 +76,9 @@ def test_network_deployment(self):
             raise Exception('Uninstall aws-example-network failed.')
 
 
-class TestAWS432(AWSTestbase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
-
-
-
-class TestAWS1853(AWSTestbase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '18.5.3/community-release/' \
-               'cloudify-manager-install-community-18.5.3.rpm'
-
-
 class TestAWS440(AWSTestbase):
 
     @property
     def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.4.0/rc2-release/' \
-               'cloudify-manager-install-4.4rc2.rpm'
+        return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
+               'ga-release/cloudify-manager-install-4.4ga.rpm'

tests/test_azure.py

@@ -98,28 +98,9 @@ def test_network_deployment(self):
             raise Exception('Uninstall azure-example-network failed.')
 
 
-class TestAzure432(AzureTestBase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
-
-
-
-class TestAzure1853(AzureTestBase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '18.5.3/community-release/' \
-               'cloudify-manager-install-community-18.5.3.rpm'
-
-
 class TestAzure440(AzureTestBase):
 
     @property
     def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.4.0/rc2-release/' \
-               'cloudify-manager-install-4.4rc2.rpm'
+        return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
+               'ga-release/cloudify-manager-install-4.4ga.rpm'

tests/test_gcp.py

@@ -112,28 +112,9 @@ def test_network_deployment(self):
             raise Exception('Uninstall gcp-example-network failed.')
 
 
-class TestGCP432(GCPTestBase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
-    
-
-
-class TestGCP1853(GCPTestBase):
-
-    @property
-    def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '18.5.3/community-release/' \
-               'cloudify-manager-install-community-18.5.3.rpm'
-
-
 class TestGCP440(GCPTestBase):
 
     @property
     def cloudify_rpm_url(self):
-        return 'http://repository.cloudifysource.org/cloudify/' \
-               '4.4.0/rc2-release/' \
-               'cloudify-manager-install-4.4rc2.rpm'
+        return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
+               'ga-release/cloudify-manager-install-4.4ga.rpm'