Fix related to trusted access argument to create vis command (#7745)

* fix for Trusted access * fixing pylint issues * updating version and details --------- Co-authored-by: Jaskirat Singh <[email protected]>
Azure · Jun 27, 2024 · a0e0085 · a0e0085
1 parent 2a557e2
commit a0e0085
Show file tree

Hide file tree

Showing 6 changed files with 999 additions and 6 deletions.
diff --git a/src/workloads/HISTORY.rst b/src/workloads/HISTORY.rst
@@ -3,6 +3,9 @@
 Release History
 ===============
 
+1.1.0b2
++++++++
+* Fix for managed resources network access type option in create vis command
 1.1.0b1
 +++++++
 * Add Soft Stop feature for VIS

diff --git a/src/workloads/azext_workloads/azext_metadata.json b/src/workloads/azext_workloads/azext_metadata.json
@@ -1,4 +1,4 @@
 {
     "azext.isPreview": true,
-    "azext.minCliCoreVersion": "2.55.0"
+    "azext.minCliCoreVersion": "2.57.0"
 }
diff --git a/src/workloads/azext_workloads/custom.py b/src/workloads/azext_workloads/custom.py
@@ -82,6 +82,8 @@ def content(self):
                 properties.set_prop("environment", AAZStrType, ".environment", typ_kwargs={"flags": {"required": True}})
                 properties.set_prop("managedResourceGroupConfiguration", AAZObjectType)
                 properties.set_prop("sapProduct", AAZStrType, ".sap_product", typ_kwargs={"flags": {"required": True}})
+                properties.set_prop("managedResourcesNetworkAccessType", AAZStrType,
+                                    ".managed_resources_network_access_type")
 
             managed_resource_group_configuration = _builder.get(".properties.managedResourceGroupConfiguration")
             if managed_resource_group_configuration is not None:

diff --git a/...workloads/azext_workloads/tests/latest/recordings/test_workloads_svi_discover_custom.yaml b/...workloads/azext_workloads/tests/latest/recordings/test_workloads_svi_discover_custom.yaml
diff --git a/src/workloads/azext_workloads/tests/latest/test_workloads.py b/src/workloads/azext_workloads/tests/latest/test_workloads.py
@@ -274,16 +274,39 @@ def test_workloads_svi_update_tags(self):
     @unittest.skip('recording file not getting generted properly throwing Subscription not found')
     def test_workloads_svi_discover(self):
         self.kwargs.update({
-            'name': 'C36',
+            'name': 'C13',
             'msi': os.path.join(TEST_DIR, 'MSI.json'),
-            'centralservervmid': '/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/CLI-TESTING/providers/Microsoft.Compute/virtualMachines/c36ascsvm'
+            'centralservervmid': '/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourcegroups/ps_cli_tf_rg/providers/microsoft.compute/virtualmachines/c13ascsvm'
         })
 
-        self.cmd('workloads sap-virtual-instance create -g CLI-TESTING -n {name} --location eastus2euap --environment NonProd --sap-product S4HANA --central-server-vm {centralservervmid} --identity "{msi}"', checks=[
+        self.cmd('workloads sap-virtual-instance create -g PS_CLI_TF_RG -n {name} --location eastus --environment NonProd --sap-product S4HANA --central-server-vm {centralservervmid} --identity "{msi}"', checks=[
             self.check('name', '{name}'),
-            self.check('resourceGroup', 'CLI-TESTING'),
+            self.check('resourceGroup', 'PS_CLI_TF_RG'),
+            self.check('sapProduct', 'S4HANA'),
+            self.check('environment', 'NonProd'),
+            self.check('provisioningState', 'Succeeded'),
+            self.check('configuration.configurationType', 'Discovery')
+        ])
+
+    @unittest.skip('recording file not getting generted properly throwing Subscription not found')
+    def test_workloads_svi_discover_custom(self):
+        self.kwargs.update({
+            'name': 'C13',
+            'msi': os.path.join(TEST_DIR, 'MSI.json'),
+            'centralservervmid': '/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourcegroups/ps_cli_tf_rg/providers/microsoft.compute/virtualmachines/c13ascsvm',
+            'managedrgname': self.create_random_name(prefix='managedrg', length=15),
+            'managedrgsaname': self.create_random_name(prefix='managedrgsa', length=24),
+            'networkaccesstype': 'Private'
+        })
+
+        self.cmd('workloads sap-virtual-instance create -g PS_CLI_TF_RG -n {name} --location eastus --environment NonProd --sap-product S4HANA --central-server-vm {centralservervmid} --identity "{msi}" --managed-rg-name {managedrgname} --managed-rg-sa-name {managedrgsaname} --managed-resources-network-access-type {networkaccesstype}', checks=[
+            self.check('name', '{name}'),
+            self.check('resourceGroup', 'PS_CLI_TF_RG'),
             self.check('sapProduct', 'S4HANA'),
             self.check('environment', 'NonProd'),
+            self.check('managedResourceGroupConfiguration.name', '{managedrgname}'),
+            self.check('configuration.managedRgStorageAccountName', '{managedrgsaname}'),
+            self.check('managedResourcesNetworkAccessType', '{networkaccesstype}'),
             self.check('provisioningState', 'Succeeded'),
             self.check('configuration.configurationType', 'Discovery')
         ])

diff --git a/src/workloads/setup.py b/src/workloads/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '1.1.0b1'
+VERSION = '1.1.0b2'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers