Rd 3371 tosca compat

.circleci/config.yml

@@ -38,10 +38,10 @@ commands:
           command: pip install --user tox
       - run:
           name: Run Flake8
-          command: /home/circleci/.local/bin/tox -e code_quality
+          command: /home/circleci/.local/bin/tox -e flake8
       - run:
          name: Run nosetest
-         command: /home/circleci/.local/bin/tox -e unit_tests
+         command: /home/circleci/.local/bin/tox -e pytest
 
   check_py3_compat:
     steps:
@@ -402,10 +402,11 @@ workflows:
       - unittests_py36
       - validate_version
       - validate_documentation
-      - rhel_wagon:
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|main|dev)/
+      - rhel_wagon
+#      - rhel_wagon:
+#          filters:
+#            branches:
+#              only: /([0-9\.]*\-build|main|dev)/
 #      - wagon:
 #          filters:
 #            branches:

CHANGELOG.txt

@@ -2,3 +2,7 @@
   - New version.
 2.0.1:
   - Attempt to decrease amount of superfluous API requests, however these calls are almost all inside of the client library.
+2.0.2:
+  - Support some legacy types.
+2.0.3:
+  - Fixed issue with RETRY BAD REQUEST in preconfigure_nic

cloudify_vcd/decorators.py

@@ -1,6 +1,5 @@
 
 from pyvcloud.vcd.exceptions import (
-
     AccessForbiddenException,
     InternalServerException,
     EntityNotFoundException,

cloudify_vcd/disk_tasks.py

@@ -108,7 +108,7 @@ def detach_disk(_,
                       disk_config,
                       disk_ctx.instance.runtime_properties.get('tasks'))
     if not vapp_name:
-        ctx.logger.warn('No vapp was found to detach disk {n}.'.format(
+        ctx.logger.debug('No vapp was found to detach disk {n}.'.format(
             n=disk_id))
         last_task = None
     else:

cloudify_vcd/legacy/__init__.py

@@ -0,0 +1,13 @@
+# Copyright (c) 2020 Cloudify Platform Ltd. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

cloudify_vcd/legacy/compute/tasks.py

@@ -0,0 +1,257 @@
+# Copyright (c) 2014-21 Cloudify Platform Ltd. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from copy import deepcopy
+
+from cloudify.exceptions import OperationRetry
+
+from vcd_plugin_sdk.resources.vapp import VCloudVM, VCloudvApp
+from cloudify_common_sdk.utils import (
+    get_ctx_instance,
+    skip_creative_or_destructive_operation as skip)
+
+from .. import decorators
+from ... import vapp_tasks
+from ..utils import VM_NIC_REL
+from ...utils import (
+    expose_props,
+    get_last_task,
+    find_rels_by_type,
+    check_if_task_successful)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def create_server(vm_client, ctx, **_):
+    if not skip(type(vm_client),
+                vm_client.name,
+                ctx,
+                exists=vm_client.exists,
+                create_operation=True):
+        vm_kwargs = deepcopy(vm_client.vapp_object.kwargs)
+        if 'network' in vm_kwargs:
+            del vm_kwargs['network']
+            del vm_kwargs['network_adapter_type']
+        return vapp_tasks._create_vm(
+            vm_external=False,
+            vm_id=vm_client.name,
+            vm_client=vm_client.connection,
+            vm_vdc=vm_client.vdc_name,
+            vm_config=vm_kwargs,
+            vm_class=VCloudVM,
+            vm_ctx=ctx)
+    return vm_client.vm, None
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def configure_server(vm_client, ctx, **_):
+    resource, result = vapp_tasks._configure_vm(
+        vm_external=False,
+        vm_id=vm_client.name,
+        vm_client=vm_client.connection,
+        vm_vdc=vm_client.vdc_name,
+        vm_config=vm_client.kwargs,
+        vm_class=VCloudVM,
+        vm_ctx=ctx)
+    # operation_name = ctx.operation.name.split('.')[-1]
+    # expose_props(operation_name,
+    #              resource,
+    #              _ctx=ctx,
+    #              legacy=True)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def power_off_vapp(vm_client, ctx, **_):
+    if not skip(type(vm_client.vapp_object),
+                vm_client.vapp_object.name,
+                ctx,
+                exists=vm_client.vapp_object.exists,
+                delete_operation=True):
+        return vapp_tasks._power_off_vapp(
+            vapp_ext=False,
+            vapp_id=vm_client.name,
+            vapp_client=vm_client.vapp_object.connection,
+            vapp_vdc=vm_client.vdc_name,
+            vapp_config=vm_client.kwargs,
+            vapp_class=VCloudvApp,
+            __=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def stop_vapp(vm_client, ctx, **_):
+    if not skip(type(vm_client.vapp_object),
+                vm_client.vapp_object.name,
+                ctx,
+                exists=vm_client.vapp_object.exists,
+                delete_operation=True):
+        return vapp_tasks._stop_vapp(
+            vapp_ext=False,
+            vapp_id=vm_client.name,
+            vapp_client=vm_client.vapp_object.connection,
+            vapp_vdc=vm_client.vdc_name,
+            vapp_config=vm_client.kwargs,
+            vapp_class=VCloudvApp,
+            __=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def delete_vapp(vm_client, ctx, **_):
+    if not skip(type(vm_client.vapp_object),
+                vm_client.vapp_object.name,
+                ctx,
+                exists=vm_client.vapp_object.exists,
+                delete_operation=True):
+        return vapp_tasks._delete_vapp(
+            vapp_ext=False,
+            vapp_id=vm_client.name,
+            vapp_client=vm_client.vapp_object.connection,
+            vapp_vdc=vm_client.vdc_name,
+            vapp_config=vm_client.kwargs,
+            vapp_class=VCloudvApp,
+            __=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def start_server(vm_client, ctx, **_):
+    return vapp_tasks._start_vm(
+        vm_external=False,
+        vm_id=vm_client.name,
+        vm_client=vm_client.connection,
+        vm_vdc=vm_client.vdc_name,
+        vm_config=vm_client.kwargs,
+        vm_class=VCloudVM,
+        vm_ctx=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def stop_server(vm_client, ctx, **_):
+    return vapp_tasks._stop_vm(
+        vm_external=False,
+        vm_id=vm_client.name,
+        vm_client=vm_client.connection,
+        vm_vdc=vm_client.vdc_name,
+        vm_config=vm_client.kwargs,
+        vm_class=VCloudVM,
+        vm_ctx=ctx)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def delete_server(vm_client, ctx, **_):
+    vm_id = vm_client.name
+    if not vm_id:
+        vm_id = ctx.node.properties.get('server', {}).get('name')
+    if not skip(type(vm_client),
+                vm_id,
+                exists=vm_client.exists,
+                delete_operation=True):
+        return vapp_tasks._delete_vm(
+            vm_external=False,
+            vm_id=vm_id,
+            vm_client=vm_client.connection,
+            vm_vdc=vm_client.vdc_name,
+            vm_config=vm_client.kwargs,
+            vm_class=VCloudVM,
+            vm_ctx=ctx)
+    return vm_client.vm, None
+
+
+@decorators.with_port_resource()
+def port_creation_validation(*_, **__):
+    pass
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def preconfigure_nic(vm_client, ctx, server, **kwargs):
+    for port_ctx in find_rels_by_type(get_ctx_instance(), VM_NIC_REL):
+        resource, result = vapp_tasks._add_network(
+            nic_config=port_ctx.target.instance.runtime_properties['port'],
+            nic_ctx=port_ctx.target,
+            vm_id=vm_client.name,
+            vm_client=vm_client.connection,
+            vm_vdc=vm_client.vdc_name,
+            vm_config=server,
+            vm_class=VCloudVM,
+            vm_ctx=ctx,
+            **kwargs)
+        last_task = get_last_task(result)
+        if not check_if_task_successful(resource, last_task):
+            raise OperationRetry('Pending for operation completion.')
+        operation_name = ctx.operation.name.split('.')[-1]
+        expose_props(operation_name,
+                     resource,
+                     _ctx=port_ctx.target,
+                     legacy=True)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def postconfigure_nic(vm_client, server, ctx, **kwargs):
+    vm_id = vm_client.name
+    if not vm_id:
+        vm_id = ctx.node.properties.get('server', {}).get('name')
+    ctx.logger.info('Preconfigure vm client name {}'.format(vm_id))
+    ctx.logger.info('Preconfigure server {}'.format(server))
+    for port_ctx in find_rels_by_type(get_ctx_instance(), VM_NIC_REL):
+        # port = convert_nic_config(
+        #     port_ctx.target.instance.runtime_properties['port'])
+        resource, result = vapp_tasks._add_nic(
+            nic_config=port_ctx.target.instance.runtime_properties['port'],
+            nic_ctx=port_ctx.target,
+            vm_id=vm_id,
+            vm_client=vm_client.connection,
+            vm_vdc=vm_client.vdc_name,
+            vm_config=server,
+            vm_class=VCloudVM,
+            vm_ctx=ctx,
+            **kwargs)
+        last_task = get_last_task(result)
+        if not check_if_task_successful(resource, last_task):
+            raise OperationRetry('Pending for add nic operation completion...')
+        operation_name = ctx.operation.name.split('.')[-1]
+        expose_props(operation_name,
+                     resource,
+                     _ctx=port_ctx.target,
+                     legacy=True)
+
+
+@decorators.with_vcd_client()
+@decorators.with_vm_resource()
+def unlink_nic(vm_client, ctx, **kwargs):
+    for port_ctx in find_rels_by_type(get_ctx_instance(), VM_NIC_REL):
+        resource, result = vapp_tasks._delete_nic(
+            nic_config=port_ctx.target.instance.runtime_properties['port'],
+            nic_ctx=port_ctx.target,
+            vm_id=vm_client.name,
+            vm_client=vm_client.connection,
+            vm_vdc=vm_client.vdc_name,
+            vm_config=vm_client.kwargs,
+            vm_class=VCloudVM,
+            vm_ctx=ctx,
+            **kwargs)
+        last_task = get_last_task(result)
+        if not check_if_task_successful(resource, last_task):
+            raise OperationRetry('Pending for unlink operation completion...')
+        operation_name = ctx.operation.name.split('.')[-1]
+        expose_props(operation_name,
+                     resource,
+                     _ctx=port_ctx.target,
+                     legacy=True)