From 2756a56891415324028571d8a96411b29c7650ac Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Wed, 23 Sep 2020 19:23:24 +0000 Subject: [PATCH] Generated from d6eedbe0eae84bb708180f299f9fb8e9cd1556e9 GET -> Get --- src/connectedmachine/HISTORY.rst | 8 - .../azext_connectedmachine/generated/_help.py | 16 +- .../generated/_params.py | 15 +- .../latest/test_connectedmachine_scenario.py | 244 ++++++------------ src/connectedmachine/setup.py | 2 +- 5 files changed, 104 insertions(+), 181 deletions(-) diff --git a/src/connectedmachine/HISTORY.rst b/src/connectedmachine/HISTORY.rst index 49706ddb961..1c139576ba0 100644 --- a/src/connectedmachine/HISTORY.rst +++ b/src/connectedmachine/HISTORY.rst @@ -3,14 +3,6 @@ Release History =============== -0.2.0 -+++++ -* machineextensions support - -0.1.1 -+++++ -* Remove the limitation of max compatible cli core version - 0.1.0 ++++++ * Initial release. diff --git a/src/connectedmachine/azext_connectedmachine/generated/_help.py b/src/connectedmachine/azext_connectedmachine/generated/_help.py index ceddee2e726..4002b832a83 100644 --- a/src/connectedmachine/azext_connectedmachine/generated/_help.py +++ b/src/connectedmachine/azext_connectedmachine/generated/_help.py @@ -65,7 +65,7 @@ examples: - name: Get Machine Extension text: |- - az connectedmachine machine-extension show --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension show --machine-name "myMachine" --n "CustomScriptExtension" \ --resource-group "myResourceGroup" """ @@ -75,7 +75,7 @@ examples: - name: Create or Update a Machine Extension text: |- - az connectedmachine machine-extension create --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension create --machine-name "myMachine" --n "CustomScriptExtension" \ --location "eastus2euap" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings \ "{\\"commandToExecute\\":\\"powershell.exe -c \\\\\\"Get-Process | Where-Object { $_.CPU -gt 10000 }\\\\\\"\\"}" \ --type-handler-version "1.10" --resource-group "myResourceGroup" @@ -85,9 +85,9 @@ type: command short-summary: "The operation to update the extension." examples: - - name: Update a Machine Extension + - name: Create or Update a Machine Extension text: |- - az connectedmachine machine-extension update --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension update --machine-name "myMachine" --n "CustomScriptExtension" \ --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\\"commandToExecute\\":\\"powershell.exe \ -c \\\\\\"Get-Process | Where-Object { $_.CPU -lt 100 }\\\\\\"\\"}" --type-handler-version "1.10" --resource-group \ "myResourceGroup" @@ -99,7 +99,7 @@ examples: - name: Delete a Machine Extension text: |- - az connectedmachine machine-extension delete --machine-name "myMachine" --name "MMA" --resource-group \ + az connectedmachine machine-extension delete --machine-name "myMachine" --n "MMA" --resource-group \ "myResourceGroup" """ @@ -111,16 +111,16 @@ - name: Pause executing next line of CLI script until the connectedmachine machine-extension is successfully \ created. text: |- - az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension wait --machine-name "myMachine" --n "CustomScriptExtension" \ --resource-group "myResourceGroup" --created - name: Pause executing next line of CLI script until the connectedmachine machine-extension is successfully \ updated. text: |- - az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension wait --machine-name "myMachine" --n "CustomScriptExtension" \ --resource-group "myResourceGroup" --updated - name: Pause executing next line of CLI script until the connectedmachine machine-extension is successfully \ deleted. text: |- - az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \ + az connectedmachine machine-extension wait --machine-name "myMachine" --n "CustomScriptExtension" \ --resource-group "myResourceGroup" --deleted """ diff --git a/src/connectedmachine/azext_connectedmachine/generated/_params.py b/src/connectedmachine/azext_connectedmachine/generated/_params.py index 989a9057cc7..c3aabe93b84 100644 --- a/src/connectedmachine/azext_connectedmachine/generated/_params.py +++ b/src/connectedmachine/azext_connectedmachine/generated/_params.py @@ -45,13 +45,15 @@ def load_arguments(self, _): with self.argument_context('connectedmachine machine-extension show') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('machine_name', type=str, help='The name of the machine containing the extension.', id_part='name') - c.argument('name', options_list=['--name', '-n', '--extension-name'], type=str, help='The name of the machine extension.', id_part='child_name_1') + c.argument('name', options_list=['-n', '--extension-name', '--name'], type=str, help='The name of the machine ' + 'extension.', id_part='child_name_1') with self.argument_context('connectedmachine machine-extension create') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('machine_name', type=str, help='The name of the machine where the extension should be created or ' 'updated.') - c.argument('name', options_list=['--name', '-n', '--extension-name'], type=str, help='The name of the machine extension.') + c.argument('name', options_list=['-n', '--extension-name', '--name'], type=str, help='The name of the machine ' + 'extension.') c.argument('tags', tags_type) c.argument('location', arg_type=get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group) @@ -75,7 +77,8 @@ def load_arguments(self, _): c.argument('resource_group_name', resource_group_name_type) c.argument('machine_name', type=str, help='The name of the machine where the extension should be created or ' 'updated.', id_part='name') - c.argument('name', options_list=['--name', '-n', '--extension-name'], type=str, help='The name of the machine extension.', id_part='child_name_1') + c.argument('name', options_list=['-n', '--extension-name', '--name'], type=str, help='The name of the machine ' + 'extension.', id_part='child_name_1') c.argument('tags', tags_type) c.argument('force_update_tag', type=str, help='How the extension handler should be forced to update even if ' 'the extension configuration has not changed.') @@ -97,9 +100,11 @@ def load_arguments(self, _): c.argument('resource_group_name', resource_group_name_type) c.argument('machine_name', type=str, help='The name of the machine where the extension should be deleted.', id_part='name') - c.argument('name', options_list=['--name', '-n', '--extension-name'], type=str, help='The name of the machine extension.', id_part='child_name_1') + c.argument('name', options_list=['-n', '--extension-name', '--name'], type=str, help='The name of the machine ' + 'extension.', id_part='child_name_1') with self.argument_context('connectedmachine machine-extension wait') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('machine_name', type=str, help='The name of the machine containing the extension.', id_part='name') - c.argument('name', options_list=['--name', '-n', '--extension-name'], type=str, help='The name of the machine extension.', id_part='child_name_1') + c.argument('name', options_list=['-n', '--extension-name', '--name'], type=str, help='The name of the machine ' + 'extension.', id_part='child_name_1') diff --git a/src/connectedmachine/azext_connectedmachine/tests/latest/test_connectedmachine_scenario.py b/src/connectedmachine/azext_connectedmachine/tests/latest/test_connectedmachine_scenario.py index 64a44f849ed..7fbbeb279c3 100644 --- a/src/connectedmachine/azext_connectedmachine/tests/latest/test_connectedmachine_scenario.py +++ b/src/connectedmachine/azext_connectedmachine/tests/latest/test_connectedmachine_scenario.py @@ -12,210 +12,136 @@ from azure.cli.testsdk import ScenarioTest from .. import try_manual, raise_if, calc_coverage from azure.cli.testsdk import ResourceGroupPreparer -from azure_devtools.scenario_tests import AllowLargeResponse - -TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..')) -CUSTOM_SCRIPT_EXTENSION_NAME = 'customScript' -DEPENDENCY_AGENT_EXTENSION_NAME = 'dependencyAgent' - -# Constants for Machine tests -MACHINES_RESOURCE_GROUP_NAME = 'AzcmagentTest' -MACHINES_MACHINE_NAME = '0.10.20225.002' -MACHINES_LOCATION = 'eastus2euap' - -# Constants for Machine Extension tests -EXTENSIONS_RESOURCE_GROUP_NAME = 'csharp-sdk-test' -EXTENSIONS_MACHINE_NAME = 'thinkpad' -EXTENSIONS_LOCATION = 'eastus' -@try_manual -def setup(test): - # This machine needs to already exist - test.cmd('az connectedmachine machine show ' - f'--name "{EXTENSIONS_MACHINE_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', EXTENSIONS_MACHINE_NAME), - test.check('location', EXTENSIONS_LOCATION) - ]) +TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..')) @try_manual -def cleanup(test): +def setup(test, rg): pass -# Machine tests - - -# EXAMPLE: /Machines/get/Get Machine +# EXAMPLE: /MachineExtensions/put/Create or Update a Machine Extension @try_manual -def step__machines_get_get_machine(test): - test.cmd('az connectedmachine machine show ' - f'--name "{MACHINES_MACHINE_NAME}" ' - f'--resource-group "{MACHINES_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', MACHINES_MACHINE_NAME), - test.check('location', MACHINES_LOCATION) - ]) +def step__machineextensions_put(test, rg): + test.cmd('az connectedmachine machine-extension create ' + '--machine-name "myMachine" ' + '--n "CustomScriptExtension" ' + '--location "eastus2euap" ' + '--type "CustomScriptExtension" ' + '--publisher "Microsoft.Compute" ' + '--settings "{{\\"commandToExecute\\":\\"powershell.exe -c \\\\\\"Get-Process | Where-Object {{ $_.CPU ' + '-gt 10000 }}\\\\\\"\\"}}" ' + '--type-handler-version "1.10" ' + '--resource-group "{rg}"', + checks=[]) -# EXAMPLE: /Machines/get/List Machines by resource group +# EXAMPLE: /MachineExtensions/get/Get Machine Extension @try_manual -def step__machines_get_list_machines_by_resource_group(test): - test.cmd('az connectedmachine machine list ' - f'--resource-group "{MACHINES_RESOURCE_GROUP_NAME}"', - checks=[ - test.greater_than('length(@)', 400) - ]) +def step__machineextensions_get_get_machine_extension(test, rg): + test.cmd('az connectedmachine machine-extension show ' + '--machine-name "myMachine" ' + '--n "CustomScriptExtension" ' + '--resource-group "{rg}"', + checks=[]) -# EXAMPLE: /Machines/delete/Delete a Machine +# EXAMPLE: /MachineExtensions/get/Get all Machine Extensions @try_manual -def step__machines_delete_delete_a_machine(test): - list = test.cmd('az connectedmachine machine list ' - f'--resource-group "{MACHINES_RESOURCE_GROUP_NAME}"', - checks=[ - test.greater_than('length(@)', 400) - ]).get_output_in_json() - - nameToDelete = next(machine['name'] for machine in list if machine['name'] != MACHINES_MACHINE_NAME) - test.cmd('az connectedmachine machine delete -y ' - f'--name "{nameToDelete}" ' - f'--resource-group "{MACHINES_RESOURCE_GROUP_NAME}"', +def step__machineextensions_get(test, rg): + test.cmd('az connectedmachine machine-extension list ' + '--machine-name "myMachine" ' + '--resource-group "{rg}"', checks=[]) -# Machine Extension tests +# EXAMPLE: /MachineExtensions/patch/Create or Update a Machine Extension +@try_manual +def step__machineextensions_patch(test, rg): + test.cmd('az connectedmachine machine-extension update ' + '--machine-name "myMachine" ' + '--n "CustomScriptExtension" ' + '--type "CustomScriptExtension" ' + '--publisher "Microsoft.Compute" ' + '--settings "{{\\"commandToExecute\\":\\"powershell.exe -c \\\\\\"Get-Process | Where-Object {{ $_.CPU ' + '-lt 100 }}\\\\\\"\\"}}" ' + '--type-handler-version "1.10" ' + '--resource-group "{rg}"', + checks=[]) -# EXAMPLE: /MachineExtensions/put/Create or Update a Machine Extension +# EXAMPLE: /Machines/get/Get Machine @try_manual -def step__machineextensions_put(test): - test.cmd('az connectedmachine machine-extension create ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{DEPENDENCY_AGENT_EXTENSION_NAME}" ' - f'--location "{EXTENSIONS_LOCATION}" ' - '--type "DependencyAgentLinux" ' - '--publisher "Microsoft.Azure.Monitoring.DependencyAgent" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', DEPENDENCY_AGENT_EXTENSION_NAME) - ]) +def step__machines_get_get_machine(test, rg): + test.cmd('az connectedmachine machine show ' + '--name "myMachine" ' + '--resource-group "{rg}"', + checks=[]) -# EXAMPLE: /MachineExtensions/patch/Create or Update a Machine Extension -@try_manual -def step__machineextensions_patch(test): - # Create an extension to update - test.cmd('az connectedmachine machine-extension create ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{CUSTOM_SCRIPT_EXTENSION_NAME}" ' - f'--location "{EXTENSIONS_LOCATION}" ' - '--type "CustomScript" ' - '--publisher "Microsoft.Azure.Extensions" ' - r"""--settings '{{"commandToExecute":"ls"}}' """ - '--type-handler-version "2.1" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', CUSTOM_SCRIPT_EXTENSION_NAME), - test.check('provisioningState', 'Succeeded'), - test.check('settings.commandToExecute', 'ls') - ]) - - # update the extension - test.cmd('az connectedmachine machine-extension update ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{CUSTOM_SCRIPT_EXTENSION_NAME}" ' - r"""--settings '{{"commandToExecute":"ls -a"}}' """ - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', CUSTOM_SCRIPT_EXTENSION_NAME), - test.check('provisioningState', 'Succeeded'), - test.check('settings.commandToExecute', 'ls -a') - ]) - - -# EXAMPLE: /MachineExtensions/get/GET Machine Extension +# EXAMPLE: /Machines/get/List Machines by resource group @try_manual -def step__machineextensions_get_get_machine_extension(test): - print('this happened') - test.cmd('az connectedmachine machine-extension show ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{CUSTOM_SCRIPT_EXTENSION_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('name', CUSTOM_SCRIPT_EXTENSION_NAME), - test.check('provisioningState', 'Succeeded') - ]) +def step__machines_get_list_machines_by_resource_group(test, rg): + test.cmd('az connectedmachine machine list ' + '--resource-group "{rg}"', + checks=[]) -# EXAMPLE: /MachineExtensions/get/GET all Machine Extensions +# EXAMPLE: /Machines/get/List Machines by resource group @try_manual -def step__machineextensions_get(test): - test.cmd('az connectedmachine machine-extension list ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('length(@)', 2) - ]) +def step__machines_get_list_machines_by_resource_group(test, rg): + test.cmd('az connectedmachine machine list ' + '--resource-group "{rg}"', + checks=[]) # EXAMPLE: /MachineExtensions/delete/Delete a Machine Extension @try_manual -def step__machineextensions_delete(test): +def step__machineextensions_delete(test, rg): test.cmd('az connectedmachine machine-extension delete -y ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{DEPENDENCY_AGENT_EXTENSION_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', + '--machine-name "myMachine" ' + '--n "MMA" ' + '--resource-group "{rg}"', checks=[]) - test.cmd('az connectedmachine machine-extension list ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('length(@)', 1) - ]) - test.cmd('az connectedmachine machine-extension delete -y ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--name "{CUSTOM_SCRIPT_EXTENSION_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', +# EXAMPLE: /Machines/delete/Delete a Machine +@try_manual +def step__machines_delete_delete_a_machine(test, rg): + test.cmd('az connectedmachine machine delete -y ' + '--name "myMachine" ' + '--resource-group "{rg}"', checks=[]) - test.cmd('az connectedmachine machine-extension list ' - f'--machine-name "{EXTENSIONS_MACHINE_NAME}" ' - f'--resource-group "{EXTENSIONS_RESOURCE_GROUP_NAME}"', - checks=[ - test.check('length(@)', 0) - ]) - @try_manual -def call_scenario(test): - setup(test) - # Machines - step__machines_get_get_machine(test) - step__machines_get_list_machines_by_resource_group(test) - step__machines_get_list_machines_by_resource_group(test) - step__machines_delete_delete_a_machine(test) +def cleanup(test, rg): + pass - # Machine Extensions - step__machineextensions_put(test) - step__machineextensions_patch(test) - step__machineextensions_get_get_machine_extension(test) - step__machineextensions_get(test) - step__machineextensions_delete(test) - cleanup(test) +@try_manual +def call_scenario(test, rg): + setup(test, rg) + step__machineextensions_put(test, rg) + step__machineextensions_get_get_machine_extension(test, rg) + step__machineextensions_get(test, rg) + step__machineextensions_patch(test, rg) + step__machines_get_get_machine(test, rg) + step__machines_get_list_machines_by_resource_group(test, rg) + step__machines_get_list_machines_by_resource_group(test, rg) + step__machineextensions_delete(test, rg) + step__machines_delete_delete_a_machine(test, rg) + cleanup(test, rg) @try_manual class ConnectedMachineScenarioTest(ScenarioTest): - @AllowLargeResponse() - def test_connectedmachine(self): - call_scenario(self) + @ResourceGroupPreparer(name_prefix='clitestconnectedmachine_myResourceGroup'[:7], key='rg', parameter_name='rg') + def test_connectedmachine(self, rg): + + call_scenario(self, rg) calc_coverage(__file__) raise_if() diff --git a/src/connectedmachine/setup.py b/src/connectedmachine/setup.py index e68a723d96c..c6cc3f56f62 100644 --- a/src/connectedmachine/setup.py +++ b/src/connectedmachine/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '0.2.0' +VERSION = '0.1.0' try: from azext_connectedmachine.manual.version import VERSION except ImportError: