From 091fc64aa7b92658e652470985cf1d8dbd238cc0 Mon Sep 17 00:00:00 2001 From: glukhman Date: Thu, 24 Aug 2023 11:31:45 +0300 Subject: [PATCH] Remove test back compat to 3.2 agent --- .../blueprints/compute/example_3_2.yaml | 83 ------------------- .../test_suites/agent/test_back_compat.py | 17 ---- 2 files changed, 100 deletions(-) delete mode 100644 cosmo_tester/resources/blueprints/compute/example_3_2.yaml delete mode 100644 cosmo_tester/test_suites/agent/test_back_compat.py diff --git a/cosmo_tester/resources/blueprints/compute/example_3_2.yaml b/cosmo_tester/resources/blueprints/compute/example_3_2.yaml deleted file mode 100644 index 70d0bc7bc..000000000 --- a/cosmo_tester/resources/blueprints/compute/example_3_2.yaml +++ /dev/null @@ -1,83 +0,0 @@ -tosca_definitions_version: cloudify_dsl_1_1 - -# No description because that was introduced in dsl 1.2 -# Create a file in an arbitrary location on a pre-existing VM using a plugin. -# This blueprint uses the old DSL version and old types.yaml for back compat testing. - -imports: - - http://www.getcloudify.org/spec/cloudify/3.2/types.yaml - -plugins: - test_plugin: - source: test-plugin - executor: host_agent - -node_types: - cloudify.test.nodes.File: - derived_from: cloudify.nodes.Root - properties: - path: - description: > - Where the test file should be created. - The instance ID will be appended to this. - e.g. /tmp/test_plugin_test_file_nodename_a123ff - default: /tmp/test_plugin_test_file - content: - description: What the contents of the test file should be. - default: This is a test file. - interfaces: - cloudify.interfaces.lifecycle: - create: - implementation: test_plugin.test_plugin.file.create - inputs: {} - delete: - implementation: test_plugin.test_plugin.file.delete - inputs: {} - - cloudify.test.nodes.Wait: - derived_from: cloudify.nodes.Root - properties: - delay: - description: How long to wait for, in seconds. - default: 60 - interfaces: - cloudify.interfaces.lifecycle: - create: - implementation: test_plugin.test_plugin.wait.wait - -inputs: - server_ip: - default: 127.0.0.1 - agent_user: - default: centos - path: {} - content: {} - wait: - description: How long wait node should delay, in seconds. - default: 0 - -node_templates: - vm: - type: cloudify.nodes.Compute - properties: - ip: { get_input: server_ip } - cloudify_agent: - user: { get_input: agent_user } - key: { get_secret: agent_key } - - file: - type: cloudify.test.nodes.File - properties: - path: { get_input: path } - content: { get_input: content } - relationships: - - type: cloudify.relationships.contained_in - target: vm - - wait: - type: cloudify.test.nodes.Wait - properties: - delay: { get_input: wait } - relationships: - - type: cloudify.relationships.contained_in - target: vm diff --git a/cosmo_tester/test_suites/agent/test_back_compat.py b/cosmo_tester/test_suites/agent/test_back_compat.py deleted file mode 100644 index 29c0af204..000000000 --- a/cosmo_tester/test_suites/agent/test_back_compat.py +++ /dev/null @@ -1,17 +0,0 @@ -from cosmo_tester.framework.examples import get_example_deployment -from cosmo_tester.framework.util import get_resource_path - -from . import validate_agent - - -def test_3_2_agent_install(image_based_manager, ssh_key, logger, test_config): - # Check agent install with the 3.2 types and 1.2 DSL version via ssh - example = get_example_deployment(image_based_manager, ssh_key, logger, - 'agent_install_3_2', test_config, - upload_plugin=False) - example.blueprint_file = get_resource_path( - 'blueprints/compute/example_3_2.yaml' - ) - example.upload_and_verify_install(skip_plugins_validation=True) - validate_agent(image_based_manager, example, test_config) - example.uninstall()