diff --git a/src/databox/HISTORY.rst b/src/databox/HISTORY.rst index 1c139576ba0..7eec834fab6 100644 --- a/src/databox/HISTORY.rst +++ b/src/databox/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.1.1 +++++++ +* GA databox module. 0.1.0 ++++++ diff --git a/src/databox/azext_databox/azext_metadata.json b/src/databox/azext_databox/azext_metadata.json index 13025150393..587a1ed232f 100644 --- a/src/databox/azext_databox/azext_metadata.json +++ b/src/databox/azext_databox/azext_metadata.json @@ -1,4 +1,3 @@ { - "azext.isExperimental": true, "azext.minCliCoreVersion": "2.3.1" } \ No newline at end of file diff --git a/src/databox/azext_databox/commands.py b/src/databox/azext_databox/commands.py index c5c6314fb9a..a175550e86d 100644 --- a/src/databox/azext_databox/commands.py +++ b/src/databox/azext_databox/commands.py @@ -17,7 +17,7 @@ def load_command_table(self, _): databox_jobs = CliCommandType( operations_tmpl='azext_databox.vendored_sdks.databox.operations._jobs_operations#JobsOperations.{}', client_factory=cf_jobs) - with self.command_group('databox job', databox_jobs, client_factory=cf_jobs, is_experimental=True) as g: + with self.command_group('databox job', databox_jobs, client_factory=cf_jobs) as g: g.custom_command('create', 'create_databox_job', validator=validate_create_input_parameters) g.custom_command('update', 'update_databox_job') g.custom_command('delete', 'delete_databox_job', confirmation=True) diff --git a/src/databox/setup.py b/src/databox/setup.py index b7768ea142b..ab049a1dbcf 100644 --- a/src/databox/setup.py +++ b/src/databox/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '0.1.0' +VERSION = '0.1.1' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/index.json b/src/index.json index 4f4e2b4e369..e081df25820 100644 --- a/src/index.json +++ b/src/index.json @@ -3622,8 +3622,8 @@ ], "azure-cli-ml": [ { - "downloadUrl": "https://azurecliext.blob.core.windows.net/release/azure_cli_ml-1.23.0-py3-none-any.whl", - "filename": "azure_cli_ml-1.23.0-py3-none-any.whl", + "downloadUrl": "https://azurecliext.blob.core.windows.net/release/azure_cli_ml-1.24.0-py3-none-any.whl", + "filename": "azure_cli_ml-1.24.0-py3-none-any.whl", "metadata": { "azext.minCliCoreVersion": "2.3.1", "classifiers": [ @@ -3664,7 +3664,7 @@ { "requires": [ "adal (>=1.2.1)", - "azureml-cli-common (~=1.23.0)", + "azureml-cli-common (~=1.24.0)", "cryptography (<=3.3.2)", "docker (>=3.7.2)", "msrest (>=0.6.6)", @@ -3684,9 +3684,9 @@ ] } ], - "version": "1.23.0" + "version": "1.24.0" }, - "sha256Digest": "d4cdfdbc9a2a32c705722953b5330d2864b2e69d6755fd2d1b72892e3dbdb3ae" + "sha256Digest": "eae5ad381bcfd883ff2eb8232ae8cda761810393175f341188f5c1367f45517c" }, { "downloadUrl": "https://azurecliext.blob.core.windows.net/release/azure_cli_ml-1.5.0-py2.py3-none-any.whl", @@ -6358,6 +6358,48 @@ "version": "0.1.0" }, "sha256Digest": "d5c8be4d6f3e59a44da32af66f8855c24d9855c5b7bdd2f6571c8721afa20223" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-0.1.1-py3-none-any.whl", + "filename": "costmanagement-0.1.1-py3-none-any.whl", + "metadata": { + "azext.minCliCoreVersion": "2.3.1", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/costmanagement" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "costmanagement", + "summary": "Microsoft Azure Command-Line Tools CostManagementClient Extension", + "version": "0.1.1" + }, + "sha256Digest": "0a6e0ee27fd5896b45eabf0c9227e63b3c1bbc4975adf4cb566647396fa511f2" } ], "csvmware": [ @@ -6497,6 +6539,50 @@ "version": "0.1.0" }, "sha256Digest": "93cac253cd79728eb333715ae56111ffaa287c9d650e924ea07875ab36906974" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-0.1.1-py2.py3-none-any.whl", + "filename": "databox-0.1.1-py2.py3-none-any.whl", + "metadata": { + "azext.minCliCoreVersion": "2.3.1", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/databox" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "databox", + "summary": "Microsoft Azure Command-Line Tools DataBox Extension", + "version": "0.1.1" + }, + "sha256Digest": "210ab818a566ec69c923c1bc11f8f50295c19c30be378ab67be340a70e921aa1" } ], "databricks": [ @@ -10502,6 +10588,49 @@ "version": "0.1.2" }, "sha256Digest": "35127cc723edf1c6311354326ebae9aa5b0d72d11141fddf3efc8fb84eadac81" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/logic-0.1.3-py3-none-any.whl", + "filename": "logic-0.1.3-py3-none-any.whl", + "metadata": { + "azext.isPreview": true, + "azext.minCliCoreVersion": "2.15.0", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/logic" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "logic", + "summary": "Microsoft Azure Command-Line Tools LogicManagementClient Extension", + "version": "0.1.3" + }, + "sha256Digest": "38a1e8285fa8ad34632094b749aa1bea703440c946f01fc546306b8e934f389a" } ], "maintenance": [ @@ -11243,6 +11372,48 @@ "version": "0.2.0" }, "sha256Digest": "dd301c22107f961692a4acdbb5a98d28a7e86e7fb8619f2322884a2bc5507241" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/peering-0.2.1-py3-none-any.whl", + "filename": "peering-0.2.1-py3-none-any.whl", + "metadata": { + "azext.minCliCoreVersion": "2.3.1", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/peering" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "peering", + "summary": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension", + "version": "0.2.1" + }, + "sha256Digest": "b068c12b47f17304af51431a2ae975339b7d4601a180e83916efae73d7c42600" } ], "portal": [ @@ -13677,6 +13848,92 @@ "version": "0.4.0" }, "sha256Digest": "03ef575ccf01776e99f8adb1882c77ee41278ff18901556424c753279724c9a3" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-0.4.1-py2.py3-none-any.whl", + "filename": "storage_blob_preview-0.4.1-py2.py3-none-any.whl", + "metadata": { + "azext.isPreview": true, + "azext.minCliCoreVersion": "2.16.0", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "storage-blob-preview", + "summary": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension", + "version": "0.4.1" + }, + "sha256Digest": "4cb5caa42e4c70db8ea5b33ad663246419003af30234f93ccef9aa2252e294d3" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-0.5.0-py2.py3-none-any.whl", + "filename": "storage_blob_preview-0.5.0-py2.py3-none-any.whl", + "metadata": { + "azext.isPreview": true, + "azext.minCliCoreVersion": "2.16.0", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "storage-blob-preview", + "summary": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension", + "version": "0.5.0" + }, + "sha256Digest": "a3303da3925f8ad83c8eeced02f6b8897b355a3cc249424a7e70c621ee0d3642" } ], "storage-preview": [ @@ -14221,6 +14478,50 @@ "version": "0.1.0" }, "sha256Digest": "a1d15edfcc18d9d301dea843cd7dce9845b8da6f6b1beb47a1bba35ff46eadde" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-0.1.1-py2.py3-none-any.whl", + "filename": "storagesync-0.1.1-py2.py3-none-any.whl", + "metadata": { + "azext.minCliCoreVersion": "2.3.1", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/storagesync" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "storagesync", + "summary": "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension", + "version": "0.1.1" + }, + "sha256Digest": "06d5e71b42edf721c5624cfd286b8593c68316f2b0ea4edf60c7a74835a695e2" } ], "stream-analytics": [ @@ -14876,6 +15177,48 @@ "version": "0.2.0" }, "sha256Digest": "79f257abed8ac699a395e1c61351cd2c68f3a1844d3369aca5b346b2b1c0aa10" + }, + { + "downloadUrl": "https://azcliprod.blob.core.windows.net/cli-extensions/timeseriesinsights-0.2.1-py3-none-any.whl", + "filename": "timeseriesinsights-0.2.1-py3-none-any.whl", + "metadata": { + "azext.minCliCoreVersion": "2.11.0", + "classifiers": [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: System Administrators", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: MIT License" + ], + "extensions": { + "python.details": { + "contacts": [ + { + "email": "azpycli@microsoft.com", + "name": "Microsoft Corporation", + "role": "author" + } + ], + "document_names": { + "description": "DESCRIPTION.rst" + }, + "project_urls": { + "Home": "https://github.com/Azure/azure-cli-extensions/tree/master/src/timeseriesinsights" + } + } + }, + "generator": "bdist_wheel (0.30.0)", + "license": "MIT", + "metadata_version": "2.0", + "name": "timeseriesinsights", + "summary": "Microsoft Azure Command-Line Tools TimeSeriesInsightsClient Extension", + "version": "0.2.1" + }, + "sha256Digest": "6ec3fe5ff3d92c3c2c8ba581af679567bfc430dd38fa70945b43378cf9b81ff2" } ], "virtual-network-tap": [ diff --git a/src/peering/HISTORY.rst b/src/peering/HISTORY.rst index abcd90d2e26..f5d78cdb5d2 100644 --- a/src/peering/HISTORY.rst +++ b/src/peering/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.2.1 +++++++ +* GA. 0.2.0 ++++++ diff --git a/src/peering/azext_peering/azext_metadata.json b/src/peering/azext_peering/azext_metadata.json index 13025150393..587a1ed232f 100644 --- a/src/peering/azext_peering/azext_metadata.json +++ b/src/peering/azext_peering/azext_metadata.json @@ -1,4 +1,3 @@ { - "azext.isExperimental": true, "azext.minCliCoreVersion": "2.3.1" } \ No newline at end of file diff --git a/src/peering/azext_peering/generated/commands.py b/src/peering/azext_peering/generated/commands.py index 6b8edd10521..770e657ab46 100644 --- a/src/peering/azext_peering/generated/commands.py +++ b/src/peering/azext_peering/generated/commands.py @@ -19,15 +19,14 @@ def load_command_table(self, _): operations_tmpl='azext_peering.vendored_sdks.peering.operations._legacy_peering_operations#LegacyPeeringOperati' 'ons.{}', client_factory=cf_legacy_peering) - with self.command_group('peering legacy', peering_legacy_peering, client_factory=cf_legacy_peering, - is_experimental=True) as g: + with self.command_group('peering legacy', peering_legacy_peering, client_factory=cf_legacy_peering) as g: g.custom_command('list', 'peering_legacy_list') from azext_peering.generated._client_factory import cf_peer_asn peering_peer_asn = CliCommandType( operations_tmpl='azext_peering.vendored_sdks.peering.operations._peer_asn_operations#PeerAsnOperations.{}', client_factory=cf_peer_asn) - with self.command_group('peering asn', peering_peer_asn, client_factory=cf_peer_asn, is_experimental=True) as g: + with self.command_group('peering asn', peering_peer_asn, client_factory=cf_peer_asn) as g: g.custom_command('list', 'peering_asn_list') g.custom_show_command('show', 'peering_asn_show') g.custom_command('create', 'peering_asn_create') @@ -38,8 +37,7 @@ def load_command_table(self, _): operations_tmpl='azext_peering.vendored_sdks.peering.operations._peering_location_operations#PeeringLocationOpe' 'rations.{}', client_factory=cf_peering_location) - with self.command_group('peering location', peering_peering_location, client_factory=cf_peering_location, - is_experimental=True) as g: + with self.command_group('peering location', peering_peering_location, client_factory=cf_peering_location) as g: g.custom_command('list', 'peering_location_list') from azext_peering.generated._client_factory import cf_registered_asn @@ -47,8 +45,7 @@ def load_command_table(self, _): operations_tmpl='azext_peering.vendored_sdks.peering.operations._registered_asn_operations#RegisteredAsnOperati' 'ons.{}', client_factory=cf_registered_asn) - with self.command_group('peering registered-asn', peering_registered_asn, client_factory=cf_registered_asn, - is_experimental=True) as g: + with self.command_group('peering registered-asn', peering_registered_asn, client_factory=cf_registered_asn) as g: g.custom_command('list', 'peering_registered_asn_list') g.custom_show_command('show', 'peering_registered_asn_show') g.custom_command('create', 'peering_registered_asn_create') @@ -61,7 +58,7 @@ def load_command_table(self, _): 'perations.{}', client_factory=cf_registered_prefix) with self.command_group('peering registered-prefix', peering_registered_prefix, - client_factory=cf_registered_prefix, is_experimental=True) as g: + client_factory=cf_registered_prefix) as g: g.custom_command('list', 'peering_registered_prefix_list') g.custom_show_command('show', 'peering_registered_prefix_show') g.custom_command('create', 'peering_registered_prefix_create') @@ -72,7 +69,7 @@ def load_command_table(self, _): peering_peering = CliCommandType( operations_tmpl='azext_peering.vendored_sdks.peering.operations._peering_operations#PeeringOperations.{}', client_factory=cf_peering) - with self.command_group('peering peering', peering_peering, client_factory=cf_peering, is_experimental=True) as g: + with self.command_group('peering peering', peering_peering, client_factory=cf_peering) as g: g.custom_command('list', 'peering_peering_list') g.custom_show_command('show', 'peering_peering_show') g.custom_command('create', 'peering_peering_create') @@ -84,8 +81,7 @@ def load_command_table(self, _): operations_tmpl='azext_peering.vendored_sdks.peering.operations._received_route_operations#ReceivedRouteOperati' 'ons.{}', client_factory=cf_received_route) - with self.command_group('peering received-route', peering_received_route, client_factory=cf_received_route, - is_experimental=True) as g: + with self.command_group('peering received-route', peering_received_route, client_factory=cf_received_route) as g: g.custom_command('list', 'peering_received_route_list') from azext_peering.generated._client_factory import cf_peering_service_country @@ -131,8 +127,7 @@ def load_command_table(self, _): operations_tmpl='azext_peering.vendored_sdks.peering.operations._peering_service_operations#PeeringServiceOpera' 'tions.{}', client_factory=cf_peering_service) - with self.command_group('peering service', peering_peering_service, client_factory=cf_peering_service, - is_experimental=True) as g: + with self.command_group('peering service', peering_peering_service, client_factory=cf_peering_service) as g: g.custom_command('list', 'peering_service_list') g.custom_show_command('show', 'peering_service_show') g.custom_command('create', 'peering_service_create') diff --git a/src/peering/setup.py b/src/peering/setup.py index c46297b8a14..2d7688b2cb1 100644 --- a/src/peering/setup.py +++ b/src/peering/setup.py @@ -11,7 +11,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '0.2.0' +VERSION = '0.2.1' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/storagesync/HISTORY.rst b/src/storagesync/HISTORY.rst index 1c139576ba0..b7f56598008 100644 --- a/src/storagesync/HISTORY.rst +++ b/src/storagesync/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.1.1 +++++++ +* GA. 0.1.0 ++++++ diff --git a/src/storagesync/azext_storagesync/azext_metadata.json b/src/storagesync/azext_storagesync/azext_metadata.json index 13025150393..587a1ed232f 100644 --- a/src/storagesync/azext_storagesync/azext_metadata.json +++ b/src/storagesync/azext_storagesync/azext_metadata.json @@ -1,4 +1,3 @@ { - "azext.isExperimental": true, "azext.minCliCoreVersion": "2.3.1" } \ No newline at end of file diff --git a/src/storagesync/azext_storagesync/commands.py b/src/storagesync/azext_storagesync/commands.py index f1d71da8978..45bbc1da31f 100644 --- a/src/storagesync/azext_storagesync/commands.py +++ b/src/storagesync/azext_storagesync/commands.py @@ -64,6 +64,3 @@ def load_command_table(self, _): g.custom_show_command('show', 'get_storagesync_registered_server') g.custom_command('list', 'list_storagesync_registered_server') g.wait_command('wait') - - with self.command_group('storagesync', is_experimental=True) as g: - pass diff --git a/src/storagesync/setup.py b/src/storagesync/setup.py index 6b9d92168a1..58560b504a0 100644 --- a/src/storagesync/setup.py +++ b/src/storagesync/setup.py @@ -16,7 +16,7 @@ # TODO: Confirm this is the right version number you want and it matches your # HISTORY.rst entry. -VERSION = '0.1.0' +VERSION = '0.1.1' # The full list of classifiers is available at # https://pypi.python.org/pypi?%3Aaction=list_classifiers diff --git a/src/vm-repair/azext_vm_repair/custom.py b/src/vm-repair/azext_vm_repair/custom.py index 61d302538d7..9915279d651 100644 --- a/src/vm-repair/azext_vm_repair/custom.py +++ b/src/vm-repair/azext_vm_repair/custom.py @@ -169,29 +169,27 @@ def create(cmd, vm_name, resource_group_name, repair_password=None, repair_usern # invoke enable-NestedHyperV.ps1 again to attach Disk to Nested if enable_nested: - logger.info("Running hyperv") + logger.info("Running Script win-enable-nested-hyperv.ps1 to install HyperV") - stdout, stderr = _invoke_run_command("win-enable-nested-hyperv.ps1", repair_vm_name, repair_group_name, 0) - logger.debug("stderr: %s", stderr) - if stderr: - logger.debug(stderr) - raise ScriptReturnsError('Error when running script') + run_hyperv_command = "az vm repair run -g {g} -n {name} --run-id win-enable-nested-hyperv" \ + .format(g=repair_group_name, name=repair_vm_name) + ret_enable_nested = _call_az_command(run_hyperv_command) - logger.debug("stdout: %s", stdout) - if str.find(stdout, "SuccessRestartRequired") > -1: + logger.debug("az vm repair run hyperv command returned: %s", ret_enable_nested) + + if str.find(ret_enable_nested, "SuccessRestartRequired") > -1: restart_cmd = 'az vm restart -g {rg} -n {vm}'.format(rg=repair_group_name, vm=repair_vm_name) - logger.info("restarting") + logger.info("Restarting Repair VM") restart_ret = _call_az_command(restart_cmd) - logger.info(restart_ret) + logger.debug(restart_ret) # invoking hyperv script again - logger.info("Running HyperV script again") - stdout, stderr = _invoke_run_command("win-enable-nested-hyperv.ps1", repair_vm_name, repair_group_name, 0) - if stderr: - raise ScriptReturnsError('Error when running script') + logger.info("Running win-enable-nested-hyperv.ps1 again to create nested VM") + run_hyperv_command = "az vm repair run -g {g} -n {name} --run-id win-enable-nested-hyperv" \ + .format(g=repair_group_name, name=repair_vm_name) + ret_enable_nested_again = _call_az_command(run_hyperv_command) - logger.debug("stderr: %s", stderr) - print(stdout) + logger.debug("stderr: %s", ret_enable_nested_again) created_resources = _list_resource_ids_in_rg(repair_group_name) command.set_status_success() diff --git a/src/vm-repair/setup.py b/src/vm-repair/setup.py index 334c63e64a6..933f1adba42 100644 --- a/src/vm-repair/setup.py +++ b/src/vm-repair/setup.py @@ -8,7 +8,7 @@ from codecs import open from setuptools import setup, find_packages -VERSION = "0.3.4" +VERSION = "0.3.5" CLASSIFIERS = [ 'Development Status :: 4 - Beta',