Added fixes for deployment create_or_update and validate usage

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -1054,16 +1054,19 @@ def _invoke_deployment(cli_ctx, resource_group_name, deployment_name, template,
                        subscription_id=None):
 
     from azure.cli.core.profiles import ResourceType, get_sdk
-    DeploymentProperties = get_sdk(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, 'DeploymentProperties', mod='models')
+    Deployment, DeploymentProperties = get_sdk(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, 'Deployment','DeploymentProperties', mod='models')
     properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental')
+    deployment = Deployment(properties=properties)
     smc = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
                                   subscription_id=subscription_id).deployments
     if validate:
         logger.info('==== BEGIN TEMPLATE ====')
         logger.info(json.dumps(template, indent=2))
         logger.info('==== END TEMPLATE ====')
-        return smc.validate(resource_group_name, deployment_name, properties)
-    return sdk_no_wait(no_wait, smc.create_or_update, resource_group_name, deployment_name, properties)
+        validation_poller = smc.validate(resource_group_name, deployment_name, deployment)
+        return LongRunningOperation(cli_ctx)(validation_poller)
+    return sdk_no_wait(no_wait, smc.create_or_update, resource_group_name, deployment_name, deployment)
+
 
 
 def k8s_get_credentials(cmd, client, name, resource_group_name,

src/azure-cli/azure/cli/command_modules/botservice/bot_template_deployer.py

@@ -25,8 +25,8 @@ class BotTemplateDeployer:
     def deploy_arm_template(cli_ctx, resource_group_name,  # pylint: disable=too-many-arguments
                             template_file=None, deployment_name=None,
                             parameters=None, mode=None):
-        DeploymentProperties, _ = get_sdk(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
-                                          'DeploymentProperties', 'TemplateLink', mod='models')
+        Deployment, DeploymentProperties, _ = get_sdk(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES,
+                                          'Deployment', 'DeploymentProperties', 'TemplateLink', mod='models')
 
         template = {}
         # TODO: get_file_json() can return None if specified, otherwise it can throw an error.
@@ -44,12 +44,13 @@ def deploy_arm_template(cli_ctx, resource_group_name,  # pylint: disable=too-man
 
         properties = DeploymentProperties(template=template, template_link=None,
                                           parameters=parameters, mode=mode)
+        deployment = Deployment(properties=properties)
 
         resource_management_client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
         return LongRunningOperation(cli_ctx, 'Deploying ARM Tempalte')(
             resource_management_client.deployments.create_or_update(resource_group_name,
                                                                     deployment_name,
-                                                                    properties, raw=False))
+                                                                    deployment, raw=False))
 
     @staticmethod
     def create_app(cmd, logger, client, resource_group_name, resource_name, description, kind, appid, password,  # pylint:disable=too-many-statements

src/azure-cli/azure/cli/command_modules/network/custom.py

@@ -154,7 +154,7 @@ def create_application_gateway(cmd, application_gateway_name, resource_group_nam
     from azure.cli.command_modules.network._template_builder import (
         build_application_gateway_resource, build_public_ip_resource, build_vnet_resource)
 
-    DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
+    Deployment, DeploymentProperties = cmd.get_models('Deployment', 'DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
     IPAllocationMethod = cmd.get_models('IPAllocationMethod')
 
     tags = tags or {}
@@ -222,11 +222,14 @@ def create_application_gateway(cmd, application_gateway_name, resource_group_nam
     deployment_name = 'ag_deploy_' + random_string(32)
     client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments
     properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental')
+    deployment = Deployment(properties=properties)
     if validate:
+        from azure.cli.core.commands import LongRunningOperation
         _log_pprint_template(template)
-        return client.validate(resource_group_name, deployment_name, properties)
+        validation_poller = client.validate(resource_group_name, deployment_name, deployment)
+        return LongRunningOperation(cmd.cli_ctx)(validation_poller)
 
-    return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, deployment_name, properties)
+    return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, deployment_name, deployment)
 
 
 def update_application_gateway(cmd, instance, sku=None, capacity=None, tags=None, enable_http2=None, min_capacity=None,
@@ -2707,7 +2710,7 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location=
     from azure.cli.command_modules.network._template_builder import (
         build_load_balancer_resource, build_public_ip_resource, build_vnet_resource)
 
-    DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
+    Deployment, DeploymentProperties = cmd.get_models('Deployment','DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
     IPAllocationMethod = cmd.get_models('IPAllocationMethod')
 
     tags = tags or {}
@@ -2763,11 +2766,14 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location=
     deployment_name = 'lb_deploy_' + random_string(32)
     client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments
     properties = DeploymentProperties(template=template, parameters={}, mode='incremental')
+    deployment = Deployment(properties=properties)
     if validate:
+        from azure.cli.core.commands import LongRunningOperation
         _log_pprint_template(template)
-        return client.validate(resource_group_name, deployment_name, properties)
+        validation_poller = client.validate(resource_group_name, deployment_name, deployment)
+        return LongRunningOperation(cmd.cli_ctx)(validation_poller)
 
-    return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, deployment_name, properties)
+    return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, deployment_name, deployment)
 
 
 def create_lb_inbound_nat_rule(
@@ -5654,7 +5660,7 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa
     from azure.cli.command_modules.network._template_builder import build_vpn_connection_resource
 
     client = network_client_factory(cmd.cli_ctx).virtual_network_gateway_connections
-    DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
+    Deployment, DeploymentProperties = cmd.get_models('Deployment', 'DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES)
     tags = tags or {}
 
     # Build up the ARM template
@@ -5678,12 +5684,14 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa
     deployment_name = 'vpn_connection_deploy_' + random_string(32)
     client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments
     properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental')
+    deployment = Deployment(properties=properties)
     if validate:
+        from azure.cli.core.commands import LongRunningOperation
         _log_pprint_template(template)
-        return client.validate(resource_group_name, deployment_name, properties)
-
+        validation_poller = client.validate(resource_group_name, deployment_name, deployment)
+        return LongRunningOperation(cmd.cli_ctx)(validation_poller)
     return sdk_no_wait(no_wait, client.create_or_update,
-                       resource_group_name, deployment_name, properties)
+                       resource_group_name, deployment_name, deployment)
 
 
 def update_vpn_connection(cmd, instance, routing_weight=None, shared_key=None, tags=None,

src/azure-cli/azure/cli/command_modules/resource/tests/latest/management_group_level_parameters.json

@@ -1,12 +1,12 @@
 {
-  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
     "nestedsubId": {
-      "value": "0b1f6471-1bf0-4dda-aec3-cb9272f09590"
+      "value": "a93e8c5c-63cb-4635-933f-6d166ac25187"
     },
     "storageAccountName": {
-      "value": "armbuilddemo1234"
+      "value": "armbuilddemo2345"
     }
   }
 }

src/azure-cli/azure/cli/command_modules/resource/tests/latest/management_group_level_template.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+  "$schema": "https://schema.management.azure.com/schemas/2019-08-01/managementGroupDeploymentTemplate.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
     "targetMG": {