[AutoPR vmwarecloudsimple/resource-manager] Update Microsoft.VMwareCloudSimple provider schema

sdk/compute/azure-mgmt-vmwarecloudsimple/README.rst

@@ -6,7 +6,7 @@ This is the Microsoft Azure MyService Management Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
+This package has been tested with Python 2.7, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.

sdk/compute/azure-mgmt-vmwarecloudsimple/azure/mgmt/vmwarecloudsimple/_configuration.py

@@ -21,26 +21,22 @@ class VMwareCloudSimpleClientConfiguration(AzureConfiguration):
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
      object<msrestazure.azure_active_directory>`
-    :param referer: referer url
-    :type referer: str
-    :param region_id: The region Id (westus, eastus)
-    :type region_id: str
     :param subscription_id: The subscription ID.
     :type subscription_id: str
+    :param referer: referer url
+    :type referer: str
     :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, referer, region_id, subscription_id, base_url=None):
+            self, credentials, subscription_id, referer, base_url=None):
 
         if credentials is None:
             raise ValueError("Parameter 'credentials' must not be None.")
-        if referer is None:
-            raise ValueError("Parameter 'referer' must not be None.")
-        if region_id is None:
-            raise ValueError("Parameter 'region_id' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
+        if referer is None:
+            raise ValueError("Parameter 'referer' must not be None.")
         if not base_url:
             base_url = 'https://management.azure.com'
 
@@ -53,6 +49,5 @@ def __init__(
         self.add_user_agent('Azure-SDK-For-Python')
 
         self.credentials = credentials
-        self.referer = referer
-        self.region_id = region_id
         self.subscription_id = subscription_id
+        self.referer = referer

sdk/compute/azure-mgmt-vmwarecloudsimple/azure/mgmt/vmwarecloudsimple/_vmware_cloud_simple_client.py

@@ -13,102 +13,84 @@
 from msrest import Serializer, Deserializer
 
 from ._configuration import VMwareCloudSimpleClientConfiguration
-from .operations import VMwareCloudSimpleClientOperationsMixin
-from .operations import AvailableOperations
-from .operations import DedicatedCloudNodeOperations
-from .operations import DedicatedCloudServiceOperations
-from .operations import SkusAvailabilityWithinRegionOperations
-from .operations import PrivateCloudByRegionOperations
-from .operations import ResourcePoolsByPCOperations
-from .operations import ResourcePoolByPCOperations
-from .operations import VirtualMachineTemplatesByPCOperations
-from .operations import VirtualMachineTemplateByPCOperations
-from .operations import VirtualNetworksByPCOperations
-from .operations import VirtualNetworkByPCOperations
-from .operations import UsagesWithinRegionOperations
-from .operations import VirtualMachineOperations
+from .operations import Operations
+from .operations import DedicatedCloudNodesOperations
+from .operations import DedicatedCloudServicesOperations
+from .operations import SkusAvailabilityOperations
+from .operations import PrivateCloudsOperations
+from .operations import ResourcePoolsOperations
+from .operations import VirtualMachineTemplatesOperations
+from .operations import VirtualNetworksOperations
+from .operations import UsagesOperations
+from .operations import VirtualMachinesOperations
 from . import models
 
 
-class VMwareCloudSimpleClient(VMwareCloudSimpleClientOperationsMixin, SDKClient):
+class VMwareCloudSimpleClient(SDKClient):
     """Description of the new service
 
     :ivar config: Configuration for client.
     :vartype config: VMwareCloudSimpleClientConfiguration
 
-    :ivar available_operations: AvailableOperations operations
-    :vartype available_operations: azure.mgmt.vmwarecloudsimple.operations.AvailableOperations
-    :ivar dedicated_cloud_node: DedicatedCloudNode operations
-    :vartype dedicated_cloud_node: azure.mgmt.vmwarecloudsimple.operations.DedicatedCloudNodeOperations
-    :ivar dedicated_cloud_service: DedicatedCloudService operations
-    :vartype dedicated_cloud_service: azure.mgmt.vmwarecloudsimple.operations.DedicatedCloudServiceOperations
-    :ivar skus_availability_within_region: SkusAvailabilityWithinRegion operations
-    :vartype skus_availability_within_region: azure.mgmt.vmwarecloudsimple.operations.SkusAvailabilityWithinRegionOperations
-    :ivar private_cloud_by_region: PrivateCloudByRegion operations
-    :vartype private_cloud_by_region: azure.mgmt.vmwarecloudsimple.operations.PrivateCloudByRegionOperations
-    :ivar resource_pools_by_pc: ResourcePoolsByPC operations
-    :vartype resource_pools_by_pc: azure.mgmt.vmwarecloudsimple.operations.ResourcePoolsByPCOperations
-    :ivar resource_pool_by_pc: ResourcePoolByPC operations
-    :vartype resource_pool_by_pc: azure.mgmt.vmwarecloudsimple.operations.ResourcePoolByPCOperations
-    :ivar virtual_machine_templates_by_pc: VirtualMachineTemplatesByPC operations
-    :vartype virtual_machine_templates_by_pc: azure.mgmt.vmwarecloudsimple.operations.VirtualMachineTemplatesByPCOperations
-    :ivar virtual_machine_template_by_pc: VirtualMachineTemplateByPC operations
-    :vartype virtual_machine_template_by_pc: azure.mgmt.vmwarecloudsimple.operations.VirtualMachineTemplateByPCOperations
-    :ivar virtual_networks_by_pc: VirtualNetworksByPC operations
-    :vartype virtual_networks_by_pc: azure.mgmt.vmwarecloudsimple.operations.VirtualNetworksByPCOperations
-    :ivar virtual_network_by_pc: VirtualNetworkByPC operations
-    :vartype virtual_network_by_pc: azure.mgmt.vmwarecloudsimple.operations.VirtualNetworkByPCOperations
-    :ivar usages_within_region: UsagesWithinRegion operations
-    :vartype usages_within_region: azure.mgmt.vmwarecloudsimple.operations.UsagesWithinRegionOperations
-    :ivar virtual_machine: VirtualMachine operations
-    :vartype virtual_machine: azure.mgmt.vmwarecloudsimple.operations.VirtualMachineOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.vmwarecloudsimple.operations.Operations
+    :ivar dedicated_cloud_nodes: DedicatedCloudNodes operations
+    :vartype dedicated_cloud_nodes: azure.mgmt.vmwarecloudsimple.operations.DedicatedCloudNodesOperations
+    :ivar dedicated_cloud_services: DedicatedCloudServices operations
+    :vartype dedicated_cloud_services: azure.mgmt.vmwarecloudsimple.operations.DedicatedCloudServicesOperations
+    :ivar skus_availability: SkusAvailability operations
+    :vartype skus_availability: azure.mgmt.vmwarecloudsimple.operations.SkusAvailabilityOperations
+    :ivar private_clouds: PrivateClouds operations
+    :vartype private_clouds: azure.mgmt.vmwarecloudsimple.operations.PrivateCloudsOperations
+    :ivar resource_pools: ResourcePools operations
+    :vartype resource_pools: azure.mgmt.vmwarecloudsimple.operations.ResourcePoolsOperations
+    :ivar virtual_machine_templates: VirtualMachineTemplates operations
+    :vartype virtual_machine_templates: azure.mgmt.vmwarecloudsimple.operations.VirtualMachineTemplatesOperations
+    :ivar virtual_networks: VirtualNetworks operations
+    :vartype virtual_networks: azure.mgmt.vmwarecloudsimple.operations.VirtualNetworksOperations
+    :ivar usages: Usages operations
+    :vartype usages: azure.mgmt.vmwarecloudsimple.operations.UsagesOperations
+    :ivar virtual_machines: VirtualMachines operations
+    :vartype virtual_machines: azure.mgmt.vmwarecloudsimple.operations.VirtualMachinesOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
      object<msrestazure.azure_active_directory>`
-    :param referer: referer url
-    :type referer: str
-    :param region_id: The region Id (westus, eastus)
-    :type region_id: str
     :param subscription_id: The subscription ID.
     :type subscription_id: str
+    :param referer: referer url
+    :type referer: str
     :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, referer, region_id, subscription_id, base_url=None):
+            self, credentials, subscription_id, referer, base_url=None):
 
-        self.config = VMwareCloudSimpleClientConfiguration(credentials, referer, region_id, subscription_id, base_url)
+        self.config = VMwareCloudSimpleClientConfiguration(credentials, subscription_id, referer, base_url)
         super(VMwareCloudSimpleClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2019-04-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.available_operations = AvailableOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.dedicated_cloud_node = DedicatedCloudNodeOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.dedicated_cloud_service = DedicatedCloudServiceOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.skus_availability_within_region = SkusAvailabilityWithinRegionOperations(
+        self.operations = Operations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.private_cloud_by_region = PrivateCloudByRegionOperations(
+        self.dedicated_cloud_nodes = DedicatedCloudNodesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.resource_pools_by_pc = ResourcePoolsByPCOperations(
+        self.dedicated_cloud_services = DedicatedCloudServicesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.resource_pool_by_pc = ResourcePoolByPCOperations(
+        self.skus_availability = SkusAvailabilityOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_templates_by_pc = VirtualMachineTemplatesByPCOperations(
+        self.private_clouds = PrivateCloudsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_template_by_pc = VirtualMachineTemplateByPCOperations(
+        self.resource_pools = ResourcePoolsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_networks_by_pc = VirtualNetworksByPCOperations(
+        self.virtual_machine_templates = VirtualMachineTemplatesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_network_by_pc = VirtualNetworkByPCOperations(
+        self.virtual_networks = VirtualNetworksOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.usages_within_region = UsagesWithinRegionOperations(
+        self.usages = UsagesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine = VirtualMachineOperations(
+        self.virtual_machines = VirtualMachinesOperations(
             self._client, self.config, self._serialize, self._deserialize)

sdk/compute/azure-mgmt-vmwarecloudsimple/azure/mgmt/vmwarecloudsimple/models/_models.py

@@ -629,8 +629,8 @@ class ResourcePool(Model):
 
     :param id: Required. resource pool id (privateCloudId:vsphereId)
     :type id: str
-    :param location: Azure region
-    :type location: str
+    :ivar location: Azure region
+    :vartype location: str
     :ivar name: {ResourcePoolName}
     :vartype name: str
     :ivar private_cloud_id: The Private Cloud Id
@@ -643,6 +643,7 @@ class ResourcePool(Model):
 
     _validation = {
         'id': {'required': True},
+        'location': {'readonly': True},
         'name': {'readonly': True},
         'private_cloud_id': {'readonly': True},
         'full_name': {'readonly': True},
@@ -661,7 +662,7 @@ class ResourcePool(Model):
     def __init__(self, **kwargs):
         super(ResourcePool, self).__init__(**kwargs)
         self.id = kwargs.get('id', None)
-        self.location = kwargs.get('location', None)
+        self.location = None
         self.name = None
         self.private_cloud_id = None
         self.full_name = None
@@ -935,11 +936,11 @@ class VirtualMachine(Model):
     :type expose_to_guest_vm: bool
     :ivar folder: The path to virtual machine folder in VCenter
     :vartype folder: str
-    :param guest_os: Required. The name of Guest OS
-    :type guest_os: str
-    :param guest_os_type: Required. The Guest OS type. Possible values
-     include: 'linux', 'windows', 'other'
-    :type guest_os_type: str or
+    :ivar guest_os: The name of Guest OS
+    :vartype guest_os: str
+    :ivar guest_os_type: The Guest OS type. Possible values include: 'linux',
+     'windows', 'other'
+    :vartype guest_os_type: str or
      ~azure.mgmt.vmwarecloudsimple.models.GuestOSType
     :param nics: The list of Virtual NICs
     :type nics: list[~azure.mgmt.vmwarecloudsimple.models.VirtualNic]
@@ -984,8 +985,8 @@ class VirtualMachine(Model):
         'controllers': {'readonly': True},
         'dnsname': {'readonly': True},
         'folder': {'readonly': True},
-        'guest_os': {'required': True},
-        'guest_os_type': {'required': True},
+        'guest_os': {'readonly': True},
+        'guest_os_type': {'readonly': True},
         'number_of_cores': {'required': True},
         'private_cloud_id': {'required': True},
         'provisioning_state': {'readonly': True},
@@ -1036,8 +1037,8 @@ def __init__(self, **kwargs):
         self.dnsname = None
         self.expose_to_guest_vm = kwargs.get('expose_to_guest_vm', None)
         self.folder = None
-        self.guest_os = kwargs.get('guest_os', None)
-        self.guest_os_type = kwargs.get('guest_os_type', None)
+        self.guest_os = None
+        self.guest_os_type = None
         self.nics = kwargs.get('nics', None)
         self.number_of_cores = kwargs.get('number_of_cores', None)
         self.password = kwargs.get('password', None)
@@ -1098,10 +1099,10 @@ class VirtualMachineTemplate(Model):
     :type disks: list[~azure.mgmt.vmwarecloudsimple.models.VirtualDisk]
     :param expose_to_guest_vm: Expose Guest OS or not
     :type expose_to_guest_vm: bool
-    :param guest_os: Required. The Guest OS
-    :type guest_os: str
-    :param guest_os_type: Required. The Guest OS types
-    :type guest_os_type: str
+    :ivar guest_os: The Guest OS
+    :vartype guest_os: str
+    :ivar guest_os_type: The Guest OS types
+    :vartype guest_os_type: str
     :param nics: The list of Virtual NICs
     :type nics: list[~azure.mgmt.vmwarecloudsimple.models.VirtualNic]
     :param number_of_cores: The number of CPU cores
@@ -1123,8 +1124,8 @@ class VirtualMachineTemplate(Model):
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
-        'guest_os': {'required': True},
-        'guest_os_type': {'required': True},
+        'guest_os': {'readonly': True},
+        'guest_os_type': {'readonly': True},
         'private_cloud_id': {'required': True},
         'vmwaretools': {'readonly': True},
         'type': {'readonly': True},
@@ -1161,8 +1162,8 @@ def __init__(self, **kwargs):
         self.description = kwargs.get('description', None)
         self.disks = kwargs.get('disks', None)
         self.expose_to_guest_vm = kwargs.get('expose_to_guest_vm', None)
-        self.guest_os = kwargs.get('guest_os', None)
-        self.guest_os_type = kwargs.get('guest_os_type', None)
+        self.guest_os = None
+        self.guest_os_type = None
         self.nics = kwargs.get('nics', None)
         self.number_of_cores = kwargs.get('number_of_cores', None)
         self.path = kwargs.get('path', None)
@@ -1185,8 +1186,8 @@ class VirtualNetwork(Model):
     :vartype assignable: bool
     :param id: Required. virtual network id (privateCloudId:vsphereId)
     :type id: str
-    :param location: Azure region
-    :type location: str
+    :ivar location: Azure region
+    :vartype location: str
     :ivar name: {VirtualNetworkName}
     :vartype name: str
     :ivar private_cloud_id: The Private Cloud id
@@ -1198,6 +1199,7 @@ class VirtualNetwork(Model):
     _validation = {
         'assignable': {'readonly': True},
         'id': {'required': True},
+        'location': {'readonly': True},
         'name': {'readonly': True},
         'private_cloud_id': {'readonly': True},
         'type': {'readonly': True},
@@ -1216,7 +1218,7 @@ def __init__(self, **kwargs):
         super(VirtualNetwork, self).__init__(**kwargs)
         self.assignable = None
         self.id = kwargs.get('id', None)
-        self.location = kwargs.get('location', None)
+        self.location = None
         self.name = None
         self.private_cloud_id = None
         self.type = None
@@ -1234,7 +1236,7 @@ class VirtualNic(Model):
     :type ip_addresses: list[str]
     :param mac_address: NIC MAC address
     :type mac_address: str
-    :param network: The list of Virtual Networks
+    :param network: Required. Virtual Network
     :type network: ~azure.mgmt.vmwarecloudsimple.models.VirtualNetwork
     :param nic_type: Required. NIC type. Possible values include: 'E1000',
      'E1000E', 'PCNET32', 'VMXNET', 'VMXNET2', 'VMXNET3'
@@ -1248,6 +1250,7 @@ class VirtualNic(Model):
     """
 
     _validation = {
+        'network': {'required': True},
         'nic_type': {'required': True},
         'virtual_nic_name': {'readonly': True},
     }