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..d001213faa0 100644
--- a/src/connectedmachine/azext_connectedmachine/generated/_help.py
+++ b/src/connectedmachine/azext_connectedmachine/generated/_help.py
@@ -12,115 +12,114 @@
from knack.help_files import helps
-helps['connectedmachine machine'] = """
+helps['connectedmachine'] = """
type: group
- short-summary: connectedmachine machine
+ short-summary: connectedmachine
"""
-helps['connectedmachine machine list'] = """
+helps['connectedmachine list'] = """
type: command
- short-summary: "Lists all the hybrid machines in the specified subscription."
+ short-summary: "Lists all the hybrid machines in the specified resource group. And Lists all the hybrid machines \
+in the specified subscription."
examples:
- name: List Machines by resource group
text: |-
- az connectedmachine machine list --resource-group "myResourceGroup"
+ az connectedmachine list --resource-group "myResourceGroup"
+ - name: List Machines by subscription
+ text: |-
+ az connectedmachine list
"""
-helps['connectedmachine machine show'] = """
+helps['connectedmachine show'] = """
type: command
short-summary: "Retrieves information about the model view or the instance view of a hybrid machine."
examples:
- name: Get Machine
text: |-
- az connectedmachine machine show --name "myMachine" --resource-group "myResourceGroup"
+ az connectedmachine show --name "myMachine" --resource-group "myResourceGroup"
"""
-helps['connectedmachine machine delete'] = """
+helps['connectedmachine delete'] = """
type: command
short-summary: "The operation to remove a hybrid machine identity in Azure."
examples:
- name: Delete a Machine
text: |-
- az connectedmachine machine delete --name "myMachine" --resource-group "myResourceGroup"
+ az connectedmachine delete --name "myMachine" --resource-group "myResourceGroup"
"""
-helps['connectedmachine machine-extension'] = """
+helps['connectedmachine extension'] = """
type: group
- short-summary: connectedmachine machine-extension
+ short-summary: connectedmachine extension
"""
-helps['connectedmachine machine-extension list'] = """
+helps['connectedmachine extension list'] = """
type: command
- short-summary: "The operation to get all extensions of a non-Azure machine"
+ short-summary: "The operation to get all extensions of a non-Azure machine."
examples:
- name: Get all Machine Extensions
text: |-
- az connectedmachine machine-extension list --machine-name "myMachine" --resource-group \
-"myResourceGroup"
+ az connectedmachine extension list --machine-name "myMachine" --resource-group "myResourceGroup"
"""
-helps['connectedmachine machine-extension show'] = """
+helps['connectedmachine extension show'] = """
type: command
short-summary: "The operation to get the extension."
examples:
- name: Get Machine Extension
text: |-
- az connectedmachine machine-extension show --machine-name "myMachine" --name "CustomScriptExtension" \
+ az connectedmachine extension show --machine-name "myMachine" --n "CustomScriptExtension" \
--resource-group "myResourceGroup"
"""
-helps['connectedmachine machine-extension create'] = """
+helps['connectedmachine extension create'] = """
type: command
- short-summary: "The operation to create or update the extension."
+ short-summary: "The operation to Create the extension."
examples:
- - name: Create or Update a Machine Extension
+ - name: Create or Update a Machine Extension (PUT)
text: |-
- az connectedmachine machine-extension create --machine-name "myMachine" --name "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"
+ az connectedmachine extension create --machine-name "myMachine" --n "CustomScriptExtension" --location \
+"eastus2euap" --type "CustomScriptExtension" --publisher "Microsoft.Compute" --settings "{\\"commandToExecute\\":\\"pow\
+ershell.exe -c \\\\\\"Get-Process | Where-Object { $_.CPU -gt 10000 }\\\\\\"\\"}" --type-handler-version "1.10" \
+--resource-group "myResourceGroup"
"""
-helps['connectedmachine machine-extension update'] = """
+helps['connectedmachine extension update'] = """
type: command
short-summary: "The operation to update the extension."
examples:
- - name: Update a Machine Extension
+ - name: Create or Update a Machine Extension (PATCH)
text: |-
- az connectedmachine machine-extension update --machine-name "myMachine" --name "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 \
+ az connectedmachine 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"
"""
-helps['connectedmachine machine-extension delete'] = """
+helps['connectedmachine extension delete'] = """
type: command
short-summary: "The operation to delete the extension."
examples:
- name: Delete a Machine Extension
text: |-
- az connectedmachine machine-extension delete --machine-name "myMachine" --name "MMA" --resource-group \
+ az connectedmachine extension delete --machine-name "myMachine" --n "MMA" --resource-group \
"myResourceGroup"
"""
-helps['connectedmachine machine-extension wait'] = """
+helps['connectedmachine extension wait'] = """
type: command
- short-summary: Place the CLI in a waiting state until a condition of the connectedmachine machine-extension is \
-met.
+ short-summary: Place the CLI in a waiting state until a condition of the connectedmachine extension is met.
examples:
- - name: Pause executing next line of CLI script until the connectedmachine machine-extension is successfully \
-created.
+ - name: Pause executing next line of CLI script until the connectedmachine extension is successfully created.
text: |-
- az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \
+ az connectedmachine 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.
+ - name: Pause executing next line of CLI script until the connectedmachine extension is successfully updated.
text: |-
- az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \
+ az connectedmachine 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.
+ - name: Pause executing next line of CLI script until the connectedmachine extension is successfully deleted.
text: |-
- az connectedmachine machine-extension wait --machine-name "myMachine" --name "CustomScriptExtension" \
+ az connectedmachine 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..98c10acf5eb 100644
--- a/src/connectedmachine/azext_connectedmachine/generated/_params.py
+++ b/src/connectedmachine/azext_connectedmachine/generated/_params.py
@@ -24,34 +24,36 @@
def load_arguments(self, _):
- with self.argument_context('connectedmachine machine list') as c:
+ with self.argument_context('connectedmachine list') as c:
c.argument('resource_group_name', resource_group_name_type)
- with self.argument_context('connectedmachine machine show') as c:
+ with self.argument_context('connectedmachine show') as c:
c.argument('resource_group_name', resource_group_name_type)
c.argument('machine_name', options_list=['--name', '-n', '--machine-name'], type=str, help='The name of the '
'hybrid machine.', id_part='name')
- with self.argument_context('connectedmachine machine delete') as c:
+ with self.argument_context('connectedmachine delete') as c:
c.argument('resource_group_name', resource_group_name_type)
c.argument('machine_name', options_list=['--name', '-n', '--machine-name'], type=str, help='The name of the '
'hybrid machine.', id_part='name')
- with self.argument_context('connectedmachine machine-extension list') as c:
+ with self.argument_context('connectedmachine extension list') 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.')
c.argument('expand', type=str, help='The expand expression to apply on the operation.')
- with self.argument_context('connectedmachine machine-extension show') as c:
+ with self.argument_context('connectedmachine 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:
+ with self.argument_context('connectedmachine 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)
@@ -71,11 +73,12 @@ def load_arguments(self, _):
'protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected '
'value: json-string/@json-file.')
- with self.argument_context('connectedmachine machine-extension update') as c:
+ with self.argument_context('connectedmachine extension update') 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.', 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.')
@@ -93,13 +96,15 @@ def load_arguments(self, _):
'protectedSettings or protectedSettingsFromKeyVault or no protected settings at all. Expected '
'value: json-string/@json-file.')
- with self.argument_context('connectedmachine machine-extension delete') as c:
+ with self.argument_context('connectedmachine extension delete') 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 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:
+ with self.argument_context('connectedmachine 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/generated/commands.py b/src/connectedmachine/azext_connectedmachine/generated/commands.py
index 39032d402e4..12d8b3956d7 100644
--- a/src/connectedmachine/azext_connectedmachine/generated/commands.py
+++ b/src/connectedmachine/azext_connectedmachine/generated/commands.py
@@ -20,23 +20,21 @@ def load_command_table(self, _):
operations_tmpl='azext_connectedmachine.vendored_sdks.connectedmachine.operations._machine_operations#MachineOp'
'erations.{}',
client_factory=cf_machine)
- with self.command_group('connectedmachine machine', connectedmachine_machine, client_factory=cf_machine,
- is_experimental=True) as g:
- g.custom_command('list', 'connectedmachine_machine_list')
- g.custom_show_command('show', 'connectedmachine_machine_show')
- g.custom_command('delete', 'connectedmachine_machine_delete', confirmation=True)
+ with self.command_group('connectedmachine', connectedmachine_machine, client_factory=cf_machine) as g:
+ g.custom_command('list', 'connectedmachine_list')
+ g.custom_show_command('show', 'connectedmachine_show')
+ g.custom_command('delete', 'connectedmachine_delete', confirmation=True)
from azext_connectedmachine.generated._client_factory import cf_machine_extension
connectedmachine_machine_extension = CliCommandType(
operations_tmpl='azext_connectedmachine.vendored_sdks.connectedmachine.operations._machine_extension_operations'
'#MachineExtensionOperations.{}',
client_factory=cf_machine_extension)
- with self.command_group('connectedmachine machine-extension', connectedmachine_machine_extension,
+ with self.command_group('connectedmachine extension', connectedmachine_machine_extension,
client_factory=cf_machine_extension, is_experimental=True) as g:
- g.custom_command('list', 'connectedmachine_machine_extension_list')
- g.custom_show_command('show', 'connectedmachine_machine_extension_show')
- g.custom_command('create', 'connectedmachine_machine_extension_create', supports_no_wait=True)
- g.custom_command('update', 'connectedmachine_machine_extension_update', supports_no_wait=True)
- g.custom_command('delete', 'connectedmachine_machine_extension_delete', supports_no_wait=True,
- confirmation=True)
- g.custom_wait_command('wait', 'connectedmachine_machine_extension_show')
+ g.custom_command('list', 'connectedmachine_extension_list')
+ g.custom_show_command('show', 'connectedmachine_extension_show')
+ g.custom_command('create', 'connectedmachine_extension_create', supports_no_wait=True)
+ g.custom_command('update', 'connectedmachine_extension_update', supports_no_wait=True)
+ g.custom_command('delete', 'connectedmachine_extension_delete', supports_no_wait=True, confirmation=True)
+ g.custom_wait_command('wait', 'connectedmachine_extension_show')
diff --git a/src/connectedmachine/azext_connectedmachine/generated/custom.py b/src/connectedmachine/azext_connectedmachine/generated/custom.py
index 34070c45e44..d388253eeb9 100644
--- a/src/connectedmachine/azext_connectedmachine/generated/custom.py
+++ b/src/connectedmachine/azext_connectedmachine/generated/custom.py
@@ -12,60 +12,60 @@
from azure.cli.core.util import sdk_no_wait
-def connectedmachine_machine_list(client,
- resource_group_name=None):
+def connectedmachine_list(client,
+ resource_group_name=None):
if resource_group_name:
return client.list_by_resource_group(resource_group_name=resource_group_name)
return client.list_by_subscription()
-def connectedmachine_machine_show(client,
- resource_group_name,
- machine_name):
+def connectedmachine_show(client,
+ resource_group_name,
+ machine_name):
return client.get(resource_group_name=resource_group_name,
name=machine_name,
expand="instanceView")
-def connectedmachine_machine_delete(client,
- resource_group_name,
- machine_name):
+def connectedmachine_delete(client,
+ resource_group_name,
+ machine_name):
return client.delete(resource_group_name=resource_group_name,
name=machine_name)
-def connectedmachine_machine_extension_list(client,
- resource_group_name,
- machine_name,
- expand=None):
+def connectedmachine_extension_list(client,
+ resource_group_name,
+ machine_name,
+ expand=None):
return client.list(resource_group_name=resource_group_name,
name=machine_name,
expand=expand)
-def connectedmachine_machine_extension_show(client,
- resource_group_name,
- machine_name,
- name):
+def connectedmachine_extension_show(client,
+ resource_group_name,
+ machine_name,
+ name):
return client.get(resource_group_name=resource_group_name,
name=machine_name,
extension_name=name)
-def connectedmachine_machine_extension_create(client,
- resource_group_name,
- machine_name,
- name,
- location,
- tags=None,
- force_update_tag=None,
- publisher=None,
- type_=None,
- type_handler_version=None,
- auto_upgrade_minor_version=None,
- settings=None,
- protected_settings=None,
- no_wait=False):
+def connectedmachine_extension_create(client,
+ resource_group_name,
+ machine_name,
+ name,
+ location,
+ tags=None,
+ force_update_tag=None,
+ publisher=None,
+ type_=None,
+ type_handler_version=None,
+ auto_upgrade_minor_version=None,
+ settings=None,
+ protected_settings=None,
+ no_wait=False):
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
@@ -75,7 +75,7 @@ def connectedmachine_machine_extension_create(client,
location=location,
force_update_tag=force_update_tag,
publisher=publisher,
- type=type_,
+ type_properties_type=type_,
type_handler_version=type_handler_version,
auto_upgrade_minor_version=auto_upgrade_minor_version,
settings=settings,
@@ -83,19 +83,19 @@ def connectedmachine_machine_extension_create(client,
status=None)
-def connectedmachine_machine_extension_update(client,
- resource_group_name,
- machine_name,
- name,
- tags=None,
- force_update_tag=None,
- publisher=None,
- type_=None,
- type_handler_version=None,
- auto_upgrade_minor_version=None,
- settings=None,
- protected_settings=None,
- no_wait=False):
+def connectedmachine_extension_update(client,
+ resource_group_name,
+ machine_name,
+ name,
+ tags=None,
+ force_update_tag=None,
+ publisher=None,
+ type_=None,
+ type_handler_version=None,
+ auto_upgrade_minor_version=None,
+ settings=None,
+ protected_settings=None,
+ no_wait=False):
return sdk_no_wait(no_wait,
client.begin_update,
resource_group_name=resource_group_name,
@@ -111,11 +111,11 @@ def connectedmachine_machine_extension_update(client,
protected_settings=protected_settings)
-def connectedmachine_machine_extension_delete(client,
- resource_group_name,
- machine_name,
- name,
- no_wait=False):
+def connectedmachine_extension_delete(client,
+ resource_group_name,
+ machine_name,
+ name,
+ no_wait=False):
return sdk_no_wait(no_wait,
client.begin_delete,
resource_group_name=resource_group_name,
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..39acc767a1e 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,139 @@
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'
+TEST_DIR = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
+# Env setup
@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)
- ])
+def setup(test, rg):
+ pass
+# EXAMPLE: /MachineExtensions/put/Create or Update a Machine Extension (PUT)
@try_manual
-def cleanup(test):
- pass
+def step__machineextensions_put(test, rg):
+ test.cmd('az connectedmachine 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=[])
-# Machine tests
+# EXAMPLE: /MachineExtensions/get/Get all Machine Extensions
+@try_manual
+def step__machineextensions_get(test, rg):
+ test.cmd('az connectedmachine extension list '
+ '--machine-name "myMachine" '
+ '--resource-group "{rg}"',
+ checks=[])
-# EXAMPLE: /Machines/get/Get Machine
+# EXAMPLE: /MachineExtensions/get/Get 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_get_get_machine_extension(test, rg):
+ test.cmd('az connectedmachine extension show '
+ '--machine-name "myMachine" '
+ '--n "CustomScriptExtension" '
+ '--resource-group "{rg}"',
+ checks=[])
-# EXAMPLE: /Machines/get/List Machines by resource group
+# EXAMPLE: /MachineExtensions/patch/Create or Update a Machine Extension (PATCH)
@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_patch(test, rg):
+ test.cmd('az connectedmachine 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: /Machines/delete/Delete a Machine
+# EXAMPLE: /MachineExtensions/delete/Delete a Machine Extension
@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_delete(test, rg):
+ test.cmd('az connectedmachine extension delete -y '
+ '--machine-name "myMachine" '
+ '--n "MMA" '
+ '--resource-group "{rg}"',
checks=[])
-# Machine Extension tests
+# EXAMPLE: /Machines/get/Get Machine
+@try_manual
+def step__machines_get_get_machine(test, rg):
+ test.cmd('az connectedmachine show '
+ '--name "myMachine" '
+ '--resource-group "{rg}"',
+ checks=[])
-# EXAMPLE: /MachineExtensions/put/Create or Update a Machine Extension
-@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)
- ])
-
-
-# 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
-@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')
- ])
-
-
-# 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 list '
+ '--resource-group "{rg}"',
+ checks=[])
-# EXAMPLE: /MachineExtensions/delete/Delete a Machine Extension
+# EXAMPLE: /Machines/get/List Machines by subscription
@try_manual
-def step__machineextensions_delete(test):
- 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}"',
+def step__machines_get_list_machines_by_subscription(test, rg):
+ test.cmd('az connectedmachine list '
+ '-g ""',
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}"',
- 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)
- ])
+# EXAMPLE: /Machines/delete/Delete a Machine
+@try_manual
+def step__machines_delete_delete_a_machine(test, rg):
+ test.cmd('az connectedmachine delete -y '
+ '--name "myMachine" '
+ '--resource-group "{rg}"',
+ checks=[])
+# Env cleanup
@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)
+# Testcase
+@try_manual
+def call_scenario(test, rg):
+ setup(test, rg)
+ step__machineextensions_put(test, rg)
+ step__machineextensions_get(test, rg)
+ step__machineextensions_get_get_machine_extension(test, rg)
+ step__machineextensions_patch(test, rg)
+ step__machineextensions_delete(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_subscription(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/azext_connectedmachine/vendored_sdks/connectedmachine/_configuration.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/_configuration.py
index 30e13b4570d..a92f8c39ade 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/_configuration.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/_configuration.py
@@ -48,8 +48,7 @@ def __init__(
self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2020-08-02"
- self.credential_scopes = ['https://management.azure.com/.default']
- self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
+ self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'connectedmachine/{}'.format(VERSION))
self._configure(**kwargs)
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/__init__.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/__init__.py
index 73b411ccdcb..5a8f3eca2b2 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/__init__.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/__init__.py
@@ -6,5 +6,5 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._connected_machine_async import ConnectedMachine
+from ._connected_machine import ConnectedMachine
__all__ = ['ConnectedMachine']
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration_async.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration.py
similarity index 95%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration_async.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration.py
index 7a22244ff57..d5c4025cdf6 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration_async.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_configuration.py
@@ -45,8 +45,7 @@ def __init__(
self.credential = credential
self.subscription_id = subscription_id
self.api_version = "2020-08-02"
- self.credential_scopes = ['https://management.azure.com/.default']
- self.credential_scopes.extend(kwargs.pop('credential_scopes', []))
+ self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
kwargs.setdefault('sdk_moniker', 'connectedmachine/{}'.format(VERSION))
self._configure(**kwargs)
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine_async.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine.py
similarity index 87%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine_async.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine.py
index f0a492604f8..e20292bb9d0 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine_async.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/_connected_machine.py
@@ -15,10 +15,10 @@
# pylint: disable=unused-import,ungrouped-imports
from azure.core.credentials_async import AsyncTokenCredential
-from ._configuration_async import ConnectedMachineConfiguration
-from .operations_async import MachineOperations
-from .operations_async import MachineExtensionOperations
-from .operations_async import OperationOperations
+from ._configuration import ConnectedMachineConfiguration
+from .operations import MachineOperations
+from .operations import MachineExtensionOperations
+from .operations import OperationOperations
from .. import models
@@ -26,11 +26,11 @@ class ConnectedMachine(object):
"""The Hybrid Compute Management Client.
:ivar machine: MachineOperations operations
- :vartype machine: connected_machine.aio.operations_async.MachineOperations
+ :vartype machine: connected_machine.aio.operations.MachineOperations
:ivar machine_extension: MachineExtensionOperations operations
- :vartype machine_extension: connected_machine.aio.operations_async.MachineExtensionOperations
+ :vartype machine_extension: connected_machine.aio.operations.MachineExtensionOperations
:ivar operation: OperationOperations operations
- :vartype operation: connected_machine.aio.operations_async.OperationOperations
+ :vartype operation: connected_machine.aio.operations.OperationOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/__init__.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/__init__.py
similarity index 74%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/__init__.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/__init__.py
index ff66f70f156..7a5d284a13f 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/__init__.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/__init__.py
@@ -6,9 +6,9 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._machine_operations_async import MachineOperations
-from ._machine_extension_operations_async import MachineExtensionOperations
-from ._operation_operations_async import OperationOperations
+from ._machine_operations import MachineOperations
+from ._machine_extension_operations import MachineExtensionOperations
+from ._operation_operations import OperationOperations
__all__ = [
'MachineOperations',
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_extension_operations_async.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_extension_operations.py
similarity index 88%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_extension_operations_async.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_extension_operations.py
index d7013bc5b9c..ee33730c530 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_extension_operations_async.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_extension_operations.py
@@ -9,7 +9,7 @@
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
from azure.core.polling import AsyncLROPoller, AsyncNoPolling, AsyncPollingMethod
@@ -52,7 +52,7 @@ async def _create_or_update_initial(
tags: Optional[Dict[str, str]] = None,
force_update_tag: Optional[str] = None,
publisher: Optional[str] = None,
- type: Optional[str] = None,
+ type_properties_type: Optional[str] = None,
type_handler_version: Optional[str] = None,
auto_upgrade_minor_version: Optional[bool] = None,
settings: Optional[object] = None,
@@ -61,12 +61,15 @@ async def _create_or_update_initial(
**kwargs
) -> Optional["models.MachineExtension"]:
cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MachineExtension"]]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
- _extension_parameters = models.MachineExtension(tags=tags, location=location, force_update_tag=force_update_tag, publisher=publisher, type_properties_type=type, type_handler_version_properties_type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, status=status)
+ extension_parameters = models.MachineExtension(tags=tags, location=location, force_update_tag=force_update_tag, publisher=publisher, type_properties_type=type_properties_type, type_handler_version_properties_type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, status=status)
api_version = "2020-08-02"
content_type = kwargs.pop("content_type", "application/json")
+ accept = "application/json"
# Construct URL
url = self._create_or_update_initial.metadata['url'] # type: ignore
@@ -85,13 +88,12 @@ async def _create_or_update_initial(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_extension_parameters, 'MachineExtension')
+ body_content = self._serialize.body(extension_parameters, 'MachineExtension')
body_content_kwargs['content'] = body_content
request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs)
-
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
response = pipeline_response.http_response
@@ -118,7 +120,7 @@ async def begin_create_or_update(
tags: Optional[Dict[str, str]] = None,
force_update_tag: Optional[str] = None,
publisher: Optional[str] = None,
- type: Optional[str] = None,
+ type_properties_type: Optional[str] = None,
type_handler_version: Optional[str] = None,
auto_upgrade_minor_version: Optional[bool] = None,
settings: Optional[object] = None,
@@ -143,8 +145,9 @@ async def begin_create_or_update(
:type force_update_tag: str
:param publisher: The name of the extension handler publisher.
:type publisher: str
- :param type: Specifies the type of the extension; an example is "CustomScriptExtension".
- :type type: str
+ :param type_properties_type: Specifies the type of the extension; an example is
+ "CustomScriptExtension".
+ :type type_properties_type: str
:param type_handler_version: Specifies the version of the script handler.
:type type_handler_version: str
:param auto_upgrade_minor_version: Indicates whether the extension should use a newer minor
@@ -184,7 +187,7 @@ async def begin_create_or_update(
tags=tags,
force_update_tag=force_update_tag,
publisher=publisher,
- type=type,
+ type_properties_type=type_properties_type,
type_handler_version=type_handler_version,
auto_upgrade_minor_version=auto_upgrade_minor_version,
settings=settings,
@@ -204,7 +207,14 @@ def get_long_running_output(pipeline_response):
return cls(pipeline_response, deserialized, {})
return deserialized
- if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = AsyncARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = AsyncNoPolling()
else: polling_method = polling
if cont_token:
@@ -234,12 +244,15 @@ async def _update_initial(
**kwargs
) -> Optional["models.MachineExtension"]:
cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MachineExtension"]]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
- _extension_parameters = models.MachineExtensionUpdate(tags=tags, force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings)
+ extension_parameters = models.MachineExtensionUpdate(tags=tags, force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings)
api_version = "2020-08-02"
content_type = kwargs.pop("content_type", "application/json")
+ accept = "application/json"
# Construct URL
url = self._update_initial.metadata['url'] # type: ignore
@@ -258,13 +271,12 @@ async def _update_initial(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_extension_parameters, 'MachineExtensionUpdate')
+ body_content = self._serialize.body(extension_parameters, 'MachineExtensionUpdate')
body_content_kwargs['content'] = body_content
request = self._client.patch(url, query_parameters, header_parameters, **body_content_kwargs)
-
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
response = pipeline_response.http_response
@@ -369,7 +381,14 @@ def get_long_running_output(pipeline_response):
return cls(pipeline_response, deserialized, {})
return deserialized
- if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = AsyncARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = AsyncNoPolling()
else: polling_method = polling
if cont_token:
@@ -391,7 +410,9 @@ async def _delete_initial(
**kwargs
) -> None:
cls = kwargs.pop('cls', None) # type: ClsType[None]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
@@ -473,7 +494,14 @@ def get_long_running_output(pipeline_response):
if cls:
return cls(pipeline_response, None, {})
- if polling is True: polling_method = AsyncARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = AsyncARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = AsyncNoPolling()
else: polling_method = polling
if cont_token:
@@ -508,9 +536,12 @@ async def get(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineExtension"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.get.metadata['url'] # type: ignore
@@ -528,7 +559,7 @@ async def get(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.get(url, query_parameters, header_parameters)
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
@@ -567,14 +598,17 @@ def list(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineExtensionsListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_operations_async.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_operations.py
similarity index 91%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_operations_async.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_operations.py
index 27c9c280a82..f8e703cbdae 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_machine_operations_async.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_machine_operations.py
@@ -9,7 +9,7 @@
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -59,9 +59,12 @@ async def delete(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType[None]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.delete.metadata['url'] # type: ignore
@@ -78,6 +81,7 @@ async def delete(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.delete(url, query_parameters, header_parameters)
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
@@ -114,9 +118,12 @@ async def get(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.Machine"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.get.metadata['url'] # type: ignore
@@ -135,7 +142,7 @@ async def get(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.get(url, query_parameters, header_parameters)
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
@@ -169,14 +176,17 @@ def list_by_resource_group(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
@@ -234,14 +244,17 @@ def list_by_subscription(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_operation_operations_async.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_operation_operations.py
similarity index 91%
rename from src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_operation_operations_async.py
rename to src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_operation_operations.py
index 8c3939cae8e..7797c09597d 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations_async/_operation_operations_async.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/aio/operations/_operation_operations.py
@@ -9,7 +9,7 @@
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
from azure.mgmt.core.exceptions import ARMErrorFormat
@@ -53,14 +53,17 @@ def list(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.OperationListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models.py
index b54993920c6..bd473d93b7d 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models.py
@@ -408,14 +408,14 @@ class MachineExtension(TrackedResource):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name_properties_instance_view_name: The machine extension name.
- :vartype name_properties_instance_view_name: str
- :ivar type_properties_instance_view_type: Specifies the type of the extension; an example is
+ :ivar name_instance_view_name: The machine extension name.
+ :vartype name_instance_view_name: str
+ :ivar type_instance_view_type: Specifies the type of the extension; an example is
"CustomScriptExtension".
- :vartype type_properties_instance_view_type: str
- :ivar type_handler_version_properties_instance_view_type_handler_version: Specifies the version
- of the script handler.
- :vartype type_handler_version_properties_instance_view_type_handler_version: str
+ :vartype type_instance_view_type: str
+ :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
+ script handler.
+ :vartype type_handler_version_instance_view_type_handler_version: str
:param status: Instance view status.
:type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
"""
@@ -426,9 +426,9 @@ class MachineExtension(TrackedResource):
'type': {'readonly': True},
'location': {'required': True},
'provisioning_state': {'readonly': True},
- 'name_properties_instance_view_name': {'readonly': True},
- 'type_properties_instance_view_type': {'readonly': True},
- 'type_handler_version_properties_instance_view_type_handler_version': {'readonly': True},
+ 'name_instance_view_name': {'readonly': True},
+ 'type_instance_view_type': {'readonly': True},
+ 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -445,10 +445,10 @@ class MachineExtension(TrackedResource):
'settings': {'key': 'properties.settings', 'type': 'object'},
'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
- 'name_properties_instance_view_name': {'key': 'properties.instanceView.name', 'type': 'str'},
- 'type_properties_instance_view_type': {'key': 'properties.instanceView.type', 'type': 'str'},
- 'type_handler_version_properties_instance_view_type_handler_version': {'key': 'properties.instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'properties.instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'name_instance_view_name': {'key': 'instanceView.name', 'type': 'str'},
+ 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
+ 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
+ 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
}
def __init__(
@@ -464,9 +464,9 @@ def __init__(
self.settings = kwargs.get('settings', None)
self.protected_settings = kwargs.get('protected_settings', None)
self.provisioning_state = None
- self.name_properties_instance_view_name = None
- self.type_properties_instance_view_type = None
- self.type_handler_version_properties_instance_view_type_handler_version = None
+ self.name_instance_view_name = None
+ self.type_instance_view_type = None
+ self.type_handler_version_instance_view_type_handler_version = None
self.status = kwargs.get('status', None)
@@ -579,23 +579,12 @@ class MachineExtensionProperties(msrest.serialization.Model):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name: The machine extension name.
- :vartype name: str
- :ivar type_instance_view_type: Specifies the type of the extension; an example is
- "CustomScriptExtension".
- :vartype type_instance_view_type: str
- :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
- script handler.
- :vartype type_handler_version_instance_view_type_handler_version: str
- :param status: Instance view status.
- :type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
+ :param instance_view: The machine extension instance view.
+ :type instance_view: ~connected_machine.models.MachineExtensionInstanceView
"""
_validation = {
'provisioning_state': {'readonly': True},
- 'name': {'readonly': True},
- 'type_instance_view_type': {'readonly': True},
- 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -607,10 +596,7 @@ class MachineExtensionProperties(msrest.serialization.Model):
'settings': {'key': 'settings', 'type': 'object'},
'protected_settings': {'key': 'protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
- 'name': {'key': 'instanceView.name', 'type': 'str'},
- 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
- 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'instance_view': {'key': 'instanceView', 'type': 'MachineExtensionInstanceView'},
}
def __init__(
@@ -626,10 +612,7 @@ def __init__(
self.settings = kwargs.get('settings', None)
self.protected_settings = kwargs.get('protected_settings', None)
self.provisioning_state = None
- self.name = None
- self.type_instance_view_type = None
- self.type_handler_version_instance_view_type_handler_version = None
- self.status = kwargs.get('status', None)
+ self.instance_view = kwargs.get('instance_view', None)
class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
@@ -657,23 +640,12 @@ class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name: The machine extension name.
- :vartype name: str
- :ivar type_instance_view_type: Specifies the type of the extension; an example is
- "CustomScriptExtension".
- :vartype type_instance_view_type: str
- :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
- script handler.
- :vartype type_handler_version_instance_view_type_handler_version: str
- :param status: Instance view status.
- :type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
+ :param instance_view: The machine extension instance view.
+ :type instance_view: ~connected_machine.models.MachineExtensionInstanceView
"""
_validation = {
'provisioning_state': {'readonly': True},
- 'name': {'readonly': True},
- 'type_instance_view_type': {'readonly': True},
- 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -685,10 +657,7 @@ class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
'settings': {'key': 'settings', 'type': 'object'},
'protected_settings': {'key': 'protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
- 'name': {'key': 'instanceView.name', 'type': 'str'},
- 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
- 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'instance_view': {'key': 'instanceView', 'type': 'MachineExtensionInstanceView'},
}
def __init__(
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models_py3.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models_py3.py
index 8098f04304a..bb94fd14a3c 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models_py3.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/models/_models_py3.py
@@ -434,14 +434,14 @@ class MachineExtension(TrackedResource):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name_properties_instance_view_name: The machine extension name.
- :vartype name_properties_instance_view_name: str
- :ivar type_properties_instance_view_type: Specifies the type of the extension; an example is
+ :ivar name_instance_view_name: The machine extension name.
+ :vartype name_instance_view_name: str
+ :ivar type_instance_view_type: Specifies the type of the extension; an example is
"CustomScriptExtension".
- :vartype type_properties_instance_view_type: str
- :ivar type_handler_version_properties_instance_view_type_handler_version: Specifies the version
- of the script handler.
- :vartype type_handler_version_properties_instance_view_type_handler_version: str
+ :vartype type_instance_view_type: str
+ :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
+ script handler.
+ :vartype type_handler_version_instance_view_type_handler_version: str
:param status: Instance view status.
:type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
"""
@@ -452,9 +452,9 @@ class MachineExtension(TrackedResource):
'type': {'readonly': True},
'location': {'required': True},
'provisioning_state': {'readonly': True},
- 'name_properties_instance_view_name': {'readonly': True},
- 'type_properties_instance_view_type': {'readonly': True},
- 'type_handler_version_properties_instance_view_type_handler_version': {'readonly': True},
+ 'name_instance_view_name': {'readonly': True},
+ 'type_instance_view_type': {'readonly': True},
+ 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -471,10 +471,10 @@ class MachineExtension(TrackedResource):
'settings': {'key': 'properties.settings', 'type': 'object'},
'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
- 'name_properties_instance_view_name': {'key': 'properties.instanceView.name', 'type': 'str'},
- 'type_properties_instance_view_type': {'key': 'properties.instanceView.type', 'type': 'str'},
- 'type_handler_version_properties_instance_view_type_handler_version': {'key': 'properties.instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'properties.instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'name_instance_view_name': {'key': 'instanceView.name', 'type': 'str'},
+ 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
+ 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
+ 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
}
def __init__(
@@ -501,9 +501,9 @@ def __init__(
self.settings = settings
self.protected_settings = protected_settings
self.provisioning_state = None
- self.name_properties_instance_view_name = None
- self.type_properties_instance_view_type = None
- self.type_handler_version_properties_instance_view_type_handler_version = None
+ self.name_instance_view_name = None
+ self.type_instance_view_type = None
+ self.type_handler_version_instance_view_type_handler_version = None
self.status = status
@@ -618,23 +618,12 @@ class MachineExtensionProperties(msrest.serialization.Model):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name: The machine extension name.
- :vartype name: str
- :ivar type_instance_view_type: Specifies the type of the extension; an example is
- "CustomScriptExtension".
- :vartype type_instance_view_type: str
- :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
- script handler.
- :vartype type_handler_version_instance_view_type_handler_version: str
- :param status: Instance view status.
- :type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
+ :param instance_view: The machine extension instance view.
+ :type instance_view: ~connected_machine.models.MachineExtensionInstanceView
"""
_validation = {
'provisioning_state': {'readonly': True},
- 'name': {'readonly': True},
- 'type_instance_view_type': {'readonly': True},
- 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -646,10 +635,7 @@ class MachineExtensionProperties(msrest.serialization.Model):
'settings': {'key': 'settings', 'type': 'object'},
'protected_settings': {'key': 'protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
- 'name': {'key': 'instanceView.name', 'type': 'str'},
- 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
- 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'instance_view': {'key': 'instanceView', 'type': 'MachineExtensionInstanceView'},
}
def __init__(
@@ -662,7 +648,7 @@ def __init__(
auto_upgrade_minor_version: Optional[bool] = None,
settings: Optional[object] = None,
protected_settings: Optional[object] = None,
- status: Optional["MachineExtensionInstanceViewStatus"] = None,
+ instance_view: Optional["MachineExtensionInstanceView"] = None,
**kwargs
):
super(MachineExtensionProperties, self).__init__(**kwargs)
@@ -674,10 +660,7 @@ def __init__(
self.settings = settings
self.protected_settings = protected_settings
self.provisioning_state = None
- self.name = None
- self.type_instance_view_type = None
- self.type_handler_version_instance_view_type_handler_version = None
- self.status = status
+ self.instance_view = instance_view
class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
@@ -705,23 +688,12 @@ class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
:type protected_settings: object
:ivar provisioning_state: The provisioning state, which only appears in the response.
:vartype provisioning_state: str
- :ivar name: The machine extension name.
- :vartype name: str
- :ivar type_instance_view_type: Specifies the type of the extension; an example is
- "CustomScriptExtension".
- :vartype type_instance_view_type: str
- :ivar type_handler_version_instance_view_type_handler_version: Specifies the version of the
- script handler.
- :vartype type_handler_version_instance_view_type_handler_version: str
- :param status: Instance view status.
- :type status: ~connected_machine.models.MachineExtensionInstanceViewStatus
+ :param instance_view: The machine extension instance view.
+ :type instance_view: ~connected_machine.models.MachineExtensionInstanceView
"""
_validation = {
'provisioning_state': {'readonly': True},
- 'name': {'readonly': True},
- 'type_instance_view_type': {'readonly': True},
- 'type_handler_version_instance_view_type_handler_version': {'readonly': True},
}
_attribute_map = {
@@ -733,10 +705,7 @@ class MachineExtensionPropertiesautogenerated(MachineExtensionProperties):
'settings': {'key': 'settings', 'type': 'object'},
'protected_settings': {'key': 'protectedSettings', 'type': 'object'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
- 'name': {'key': 'instanceView.name', 'type': 'str'},
- 'type_instance_view_type': {'key': 'instanceView.type', 'type': 'str'},
- 'type_handler_version_instance_view_type_handler_version': {'key': 'instanceView.typeHandlerVersion', 'type': 'str'},
- 'status': {'key': 'instanceView.status', 'type': 'MachineExtensionInstanceViewStatus'},
+ 'instance_view': {'key': 'instanceView', 'type': 'MachineExtensionInstanceView'},
}
def __init__(
@@ -749,10 +718,10 @@ def __init__(
auto_upgrade_minor_version: Optional[bool] = None,
settings: Optional[object] = None,
protected_settings: Optional[object] = None,
- status: Optional["MachineExtensionInstanceViewStatus"] = None,
+ instance_view: Optional["MachineExtensionInstanceView"] = None,
**kwargs
):
- super(MachineExtensionPropertiesautogenerated, self).__init__(force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, status=status, **kwargs)
+ super(MachineExtensionPropertiesautogenerated, self).__init__(force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, instance_view=instance_view, **kwargs)
class MachineExtensionPropertiesInstanceView(MachineExtensionInstanceView):
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_extension_operations.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_extension_operations.py
index 06125cec631..f31e2dec49c 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_extension_operations.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_extension_operations.py
@@ -8,7 +8,7 @@
from typing import TYPE_CHECKING
import warnings
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpRequest, HttpResponse
@@ -56,7 +56,7 @@ def _create_or_update_initial(
tags=None, # type: Optional[Dict[str, str]]
force_update_tag=None, # type: Optional[str]
publisher=None, # type: Optional[str]
- type=None, # type: Optional[str]
+ type_properties_type=None, # type: Optional[str]
type_handler_version=None, # type: Optional[str]
auto_upgrade_minor_version=None, # type: Optional[bool]
settings=None, # type: Optional[object]
@@ -66,12 +66,15 @@ def _create_or_update_initial(
):
# type: (...) -> Optional["models.MachineExtension"]
cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MachineExtension"]]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
- _extension_parameters = models.MachineExtension(tags=tags, location=location, force_update_tag=force_update_tag, publisher=publisher, type_properties_type=type, type_handler_version_properties_type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, status=status)
+ extension_parameters = models.MachineExtension(tags=tags, location=location, force_update_tag=force_update_tag, publisher=publisher, type_properties_type=type_properties_type, type_handler_version_properties_type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings, status=status)
api_version = "2020-08-02"
content_type = kwargs.pop("content_type", "application/json")
+ accept = "application/json"
# Construct URL
url = self._create_or_update_initial.metadata['url'] # type: ignore
@@ -90,13 +93,12 @@ def _create_or_update_initial(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_extension_parameters, 'MachineExtension')
+ body_content = self._serialize.body(extension_parameters, 'MachineExtension')
body_content_kwargs['content'] = body_content
request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs)
-
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
response = pipeline_response.http_response
@@ -123,7 +125,7 @@ def begin_create_or_update(
tags=None, # type: Optional[Dict[str, str]]
force_update_tag=None, # type: Optional[str]
publisher=None, # type: Optional[str]
- type=None, # type: Optional[str]
+ type_properties_type=None, # type: Optional[str]
type_handler_version=None, # type: Optional[str]
auto_upgrade_minor_version=None, # type: Optional[bool]
settings=None, # type: Optional[object]
@@ -149,8 +151,9 @@ def begin_create_or_update(
:type force_update_tag: str
:param publisher: The name of the extension handler publisher.
:type publisher: str
- :param type: Specifies the type of the extension; an example is "CustomScriptExtension".
- :type type: str
+ :param type_properties_type: Specifies the type of the extension; an example is
+ "CustomScriptExtension".
+ :type type_properties_type: str
:param type_handler_version: Specifies the version of the script handler.
:type type_handler_version: str
:param auto_upgrade_minor_version: Indicates whether the extension should use a newer minor
@@ -190,7 +193,7 @@ def begin_create_or_update(
tags=tags,
force_update_tag=force_update_tag,
publisher=publisher,
- type=type,
+ type_properties_type=type_properties_type,
type_handler_version=type_handler_version,
auto_upgrade_minor_version=auto_upgrade_minor_version,
settings=settings,
@@ -210,7 +213,14 @@ def get_long_running_output(pipeline_response):
return cls(pipeline_response, deserialized, {})
return deserialized
- if polling is True: polling_method = ARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = ARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = NoPolling()
else: polling_method = polling
if cont_token:
@@ -241,12 +251,15 @@ def _update_initial(
):
# type: (...) -> Optional["models.MachineExtension"]
cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.MachineExtension"]]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
- _extension_parameters = models.MachineExtensionUpdate(tags=tags, force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings)
+ extension_parameters = models.MachineExtensionUpdate(tags=tags, force_update_tag=force_update_tag, publisher=publisher, type=type, type_handler_version=type_handler_version, auto_upgrade_minor_version=auto_upgrade_minor_version, settings=settings, protected_settings=protected_settings)
api_version = "2020-08-02"
content_type = kwargs.pop("content_type", "application/json")
+ accept = "application/json"
# Construct URL
url = self._update_initial.metadata['url'] # type: ignore
@@ -265,13 +278,12 @@ def _update_initial(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
header_parameters['Content-Type'] = self._serialize.header("content_type", content_type, 'str')
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_extension_parameters, 'MachineExtensionUpdate')
+ body_content = self._serialize.body(extension_parameters, 'MachineExtensionUpdate')
body_content_kwargs['content'] = body_content
request = self._client.patch(url, query_parameters, header_parameters, **body_content_kwargs)
-
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
response = pipeline_response.http_response
@@ -377,7 +389,14 @@ def get_long_running_output(pipeline_response):
return cls(pipeline_response, deserialized, {})
return deserialized
- if polling is True: polling_method = ARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = ARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = NoPolling()
else: polling_method = polling
if cont_token:
@@ -400,7 +419,9 @@ def _delete_initial(
):
# type: (...) -> None
cls = kwargs.pop('cls', None) # type: ClsType[None]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
@@ -483,7 +504,14 @@ def get_long_running_output(pipeline_response):
if cls:
return cls(pipeline_response, None, {})
- if polling is True: polling_method = ARMPolling(lro_delay, **kwargs)
+ path_format_arguments = {
+ 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+ 'name': self._serialize.url("name", name, 'str'),
+ 'extensionName': self._serialize.url("extension_name", extension_name, 'str'),
+ 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
+ }
+
+ if polling is True: polling_method = ARMPolling(lro_delay, path_format_arguments=path_format_arguments, **kwargs)
elif polling is False: polling_method = NoPolling()
else: polling_method = polling
if cont_token:
@@ -519,9 +547,12 @@ def get(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineExtension"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.get.metadata['url'] # type: ignore
@@ -539,7 +570,7 @@ def get(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.get(url, query_parameters, header_parameters)
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
@@ -579,14 +610,17 @@ def list(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineExtensionsListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_operations.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_operations.py
index eabd3562611..2f95deeb531 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_operations.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_machine_operations.py
@@ -8,7 +8,7 @@
from typing import TYPE_CHECKING
import warnings
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpRequest, HttpResponse
@@ -64,9 +64,12 @@ def delete(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType[None]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.delete.metadata['url'] # type: ignore
@@ -83,6 +86,7 @@ def delete(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.delete(url, query_parameters, header_parameters)
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
@@ -120,9 +124,12 @@ def get(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.Machine"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
# Construct URL
url = self.get.metadata['url'] # type: ignore
@@ -141,7 +148,7 @@ def get(
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
request = self._client.get(url, query_parameters, header_parameters)
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
@@ -176,14 +183,17 @@ def list_by_resource_group(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
@@ -242,14 +252,17 @@ def list_by_subscription(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.MachineListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_operation_operations.py b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_operation_operations.py
index 81080b1c7be..3bee43af66b 100644
--- a/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_operation_operations.py
+++ b/src/connectedmachine/azext_connectedmachine/vendored_sdks/connectedmachine/operations/_operation_operations.py
@@ -8,7 +8,7 @@
from typing import TYPE_CHECKING
import warnings
-from azure.core.exceptions import HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
+from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
from azure.core.paging import ItemPaged
from azure.core.pipeline import PipelineResponse
from azure.core.pipeline.transport import HttpRequest, HttpResponse
@@ -58,14 +58,17 @@ def list(
:raises: ~azure.core.exceptions.HttpResponseError
"""
cls = kwargs.pop('cls', None) # type: ClsType["models.OperationListResult"]
- error_map = {404: ResourceNotFoundError, 409: ResourceExistsError}
+ error_map = {
+ 401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
+ }
error_map.update(kwargs.pop('error_map', {}))
api_version = "2020-08-02"
+ accept = "application/json"
def prepare_request(next_link=None):
# Construct headers
header_parameters = {} # type: Dict[str, Any]
- header_parameters['Accept'] = 'application/json'
+ header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
if not next_link:
# Construct URL
diff --git a/src/connectedmachine/report.md b/src/connectedmachine/report.md
index 4f007b54f3a..ef6bf5d4780 100644
--- a/src/connectedmachine/report.md
+++ b/src/connectedmachine/report.md
@@ -1,80 +1,121 @@
# Azure CLI Module Creation Report
-### connectedmachine machine delete
-
-delete a connectedmachine machine.
+## EXTENSION
+|CLI Extension|Command Groups|
+|---------|------------|
+|az connectedmachine|[groups](#CommandGroups)
+
+## GROUPS
+### Command groups in `az connectedmachine` extension
+|CLI Command Group|Group Swagger name|Commands|
+|---------|------------|--------|
+|az connectedmachine|Machines|[commands](#CommandsInMachines)|
+|az connectedmachine extension|MachineExtensions|[commands](#CommandsInMachineExtensions)|
+
+## COMMANDS
+### Commands in `az connectedmachine` group
+|CLI Command|Operation Swagger name|Parameters|Examples|
+|---------|------------|--------|-----------|
+|[az connectedmachine list](#MachinesListByResourceGroup)|ListByResourceGroup|[Parameters](#ParametersMachinesListByResourceGroup)|[Example](#ExamplesMachinesListByResourceGroup)|
+|[az connectedmachine list](#MachinesListBySubscription)|ListBySubscription|[Parameters](#ParametersMachinesListBySubscription)|[Example](#ExamplesMachinesListBySubscription)|
+|[az connectedmachine show](#MachinesGet)|Get|[Parameters](#ParametersMachinesGet)|[Example](#ExamplesMachinesGet)|
+|[az connectedmachine delete](#MachinesDelete)|Delete|[Parameters](#ParametersMachinesDelete)|[Example](#ExamplesMachinesDelete)|
+
+### Commands in `az connectedmachine extension` group
+|CLI Command|Operation Swagger name|Parameters|Examples|
+|---------|------------|--------|-----------|
+|[az connectedmachine extension list](#MachineExtensionsList)|List|[Parameters](#ParametersMachineExtensionsList)|[Example](#ExamplesMachineExtensionsList)|
+|[az connectedmachine extension show](#MachineExtensionsGet)|Get|[Parameters](#ParametersMachineExtensionsGet)|[Example](#ExamplesMachineExtensionsGet)|
+|[az connectedmachine extension create](#MachineExtensionsCreateOrUpdate#Create)|CreateOrUpdate#Create|[Parameters](#ParametersMachineExtensionsCreateOrUpdate#Create)|[Example](#ExamplesMachineExtensionsCreateOrUpdate#Create)|
+|[az connectedmachine extension update](#MachineExtensionsUpdate)|Update|[Parameters](#ParametersMachineExtensionsUpdate)|[Example](#ExamplesMachineExtensionsUpdate)|
+|[az connectedmachine extension delete](#MachineExtensionsDelete)|Delete|[Parameters](#ParametersMachineExtensionsDelete)|[Example](#ExamplesMachineExtensionsDelete)|
+
+
+## COMMAND DETAILS
+
+### group `az connectedmachine`
+#### Command `az connectedmachine list`
+
+##### Example
+```
+az connectedmachine list --resource-group "myResourceGroup"
+```
+##### Parameters
+|Option|Type|Description|Path (SDK)|Swagger name|
+|------|----|-----------|----------|------------|
+|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine|Machines|
+#### Command `az connectedmachine list`
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|delete|Delete|
+##### Example
+```
+az connectedmachine list
+```
+##### Parameters
+|Option|Type|Description|Path (SDK)|Swagger name|
+|------|----|-----------|----------|------------|
+#### Command `az connectedmachine show`
-#### Parameters
+##### Example
+```
+az connectedmachine show --name "myMachine" --resource-group "myResourceGroup"
+```
+##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
|**--machine-name**|string|The name of the hybrid machine.|machine_name|name|
-### connectedmachine machine list
-
-list a connectedmachine machine.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine|Machines|
-
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|list|ListByResourceGroup|
-|list|ListBySubscription|
+#### Command `az connectedmachine delete`
-#### Parameters
+##### Example
+```
+az connectedmachine delete --name "myMachine" --resource-group "myResourceGroup"
+```
+##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
+|**--machine-name**|string|The name of the hybrid machine.|machine_name|name|
-### connectedmachine machine show
-
-show a connectedmachine machine.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine|Machines|
+### group `az connectedmachine extension`
+#### Command `az connectedmachine extension list`
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|show|Get|
-
-#### Parameters
+##### Example
+```
+az connectedmachine extension list --machine-name "myMachine" --resource-group "myResourceGroup"
+```
+##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
-|**--machine-name**|string|The name of the hybrid machine.|machine_name|name|
-
-### connectedmachine machine-extension create
+|**--machine-name**|string|The name of the machine containing the extension.|machine_name|name|
+|**--expand**|string|The expand expression to apply on the operation.|expand|$expand|
-create a connectedmachine machine-extension.
+#### Command `az connectedmachine extension show`
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine-extension|MachineExtensions|
+##### Example
+```
+az connectedmachine extension show --machine-name "myMachine" --n "CustomScriptExtension" --resource-group \
+"myResourceGroup"
+```
+##### Parameters
+|Option|Type|Description|Path (SDK)|Swagger name|
+|------|----|-----------|----------|------------|
+|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
+|**--machine-name**|string|The name of the machine containing the extension.|machine_name|name|
+|**--name**|string|The name of the machine extension.|name|extensionName|
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|create|CreateOrUpdate#Create|
+#### Command `az connectedmachine extension create`
-#### Parameters
+##### Example
+```
+az connectedmachine 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"
+```
+##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
@@ -90,84 +131,16 @@ create a connectedmachine machine-extension.
|**--settings**|any|Json formatted public settings for the extension.|settings|settings|
|**--protected-settings**|any|The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.|protected_settings|protectedSettings|
-### connectedmachine machine-extension delete
-
-delete a connectedmachine machine-extension.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine-extension|MachineExtensions|
-
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|delete|Delete|
-
-#### Parameters
-|Option|Type|Description|Path (SDK)|Swagger name|
-|------|----|-----------|----------|------------|
-|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
-|**--machine-name**|string|The name of the machine where the extension should be deleted.|machine_name|name|
-|**--name**|string|The name of the machine extension.|name|extensionName|
-
-### connectedmachine machine-extension list
-
-list a connectedmachine machine-extension.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine-extension|MachineExtensions|
-
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|list|List|
-
-#### Parameters
-|Option|Type|Description|Path (SDK)|Swagger name|
-|------|----|-----------|----------|------------|
-|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
-|**--machine-name**|string|The name of the machine containing the extension.|machine_name|name|
-|**--expand**|string|The expand expression to apply on the operation.|expand|$expand|
-
-### connectedmachine machine-extension show
-
-show a connectedmachine machine-extension.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine-extension|MachineExtensions|
-
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|show|Get|
+#### Command `az connectedmachine extension update`
-#### Parameters
-|Option|Type|Description|Path (SDK)|Swagger name|
-|------|----|-----------|----------|------------|
-|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
-|**--machine-name**|string|The name of the machine containing the extension.|machine_name|name|
-|**--name**|string|The name of the machine extension.|name|extensionName|
-
-### connectedmachine machine-extension update
-
-update a connectedmachine machine-extension.
-
-#### Command group
-|Name (az)|Swagger name|
-|---------|------------|
-|connectedmachine machine-extension|MachineExtensions|
-
-#### Methods
-|Name (az)|Swagger name|
-|---------|------------|
-|update|Update|
-
-#### Parameters
+##### Example
+```
+az connectedmachine 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"
+```
+##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
@@ -181,3 +154,16 @@ update a connectedmachine machine-extension.
|**--auto-upgrade-minor-version**|boolean|Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true.|auto_upgrade_minor_version|autoUpgradeMinorVersion|
|**--settings**|any|Json formatted public settings for the extension.|settings|settings|
|**--protected-settings**|any|The extension can contain either protectedSettings or protectedSettingsFromKeyVault or no protected settings at all.|protected_settings|protectedSettings|
+
+#### Command `az connectedmachine extension delete`
+
+##### Example
+```
+az connectedmachine extension delete --machine-name "myMachine" --n "MMA" --resource-group "myResourceGroup"
+```
+##### Parameters
+|Option|Type|Description|Path (SDK)|Swagger name|
+|------|----|-----------|----------|------------|
+|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
+|**--machine-name**|string|The name of the machine where the extension should be deleted.|machine_name|name|
+|**--name**|string|The name of the machine extension.|name|extensionName|
diff --git a/src/connectedmachine/setup.py b/src/connectedmachine/setup.py
index e68a723d96c..e0725124d3c 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:
@@ -31,8 +31,9 @@
]
DEPENDENCIES = []
+
try:
- from .manual.dependency import DEPENDENCIES
+ from azext_connectedmachine.manual.dependency import DEPENDENCIES
except ImportError:
pass