[Dnc] fix bug with delegated subnet request properties

src/dnc/HISTORY.rst

@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.3
+++++++
+* Correct bug with delegate subnet
+
 0.1.2
 ++++++
 * Remove list commands

src/dnc/azext_dnc/vendored_sdks/dnc/models/__init__.py

@@ -14,7 +14,6 @@
     from ._models_py3 import DelegatedControllerProperties
     from ._models_py3 import DelegatedControllers
     from ._models_py3 import DelegatedSubnet
-    from ._models_py3 import DelegatedSubnetProperties
     from ._models_py3 import DelegatedSubnetResource
     from ._models_py3 import DelegatedSubnets
     from ._models_py3 import ErrorAdditionalInfo
@@ -39,7 +38,6 @@
     from ._models import DelegatedControllerProperties  # type: ignore
     from ._models import DelegatedControllers  # type: ignore
     from ._models import DelegatedSubnet  # type: ignore
-    from ._models import DelegatedSubnetProperties  # type: ignore
     from ._models import DelegatedSubnetResource  # type: ignore
     from ._models import DelegatedSubnets  # type: ignore
     from ._models import ErrorAdditionalInfo  # type: ignore
@@ -75,7 +73,6 @@
     'DelegatedControllerProperties',
     'DelegatedControllers',
     'DelegatedSubnet',
-    'DelegatedSubnetProperties',
     'DelegatedSubnetResource',
     'DelegatedSubnets',
     'ErrorAdditionalInfo',

src/dnc/azext_dnc/vendored_sdks/dnc/models/_models.py

@@ -271,38 +271,6 @@ class DelegatedSubnet(DelegatedSubnetResource):
     :type location: str
     :param tags: A set of tags. The resource tags.
     :type tags: dict[str, str]
-    :param properties: Properties of the provision operation request.
-    :type properties: ~dnc.models.DelegatedSubnetProperties
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'properties': {'key': 'properties', 'type': 'DelegatedSubnetProperties'},
-    }
-
-    def __init__(
-        self,
-        **kwargs
-    ):
-        super(DelegatedSubnet, self).__init__(**kwargs)
-        self.properties = kwargs.get('properties', None)
-
-
-class DelegatedSubnetProperties(msrest.serialization.Model):
-    """Properties of delegated subnet.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
     :ivar resource_guid: Resource guid.
     :vartype resource_guid: str
     :ivar provisioning_state: The current state of dnc delegated subnet resource. Possible values
@@ -315,22 +283,30 @@ class DelegatedSubnetProperties(msrest.serialization.Model):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'resource_guid': {'readonly': True},
         'provisioning_state': {'readonly': True},
     }
 
     _attribute_map = {
-        'resource_guid': {'key': 'resourceGuid', 'type': 'str'},
-        'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
-        'subnet_details': {'key': 'subnetDetails', 'type': 'SubnetDetails'},
-        'controller_details': {'key': 'controllerDetails', 'type': 'ControllerDetails'},
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'subnet_details': {'key': 'properties.subnetDetails', 'type': 'SubnetDetails'},
+        'controller_details': {'key': 'properties.controllerDetails', 'type': 'ControllerDetails'},
     }
 
     def __init__(
         self,
         **kwargs
     ):
-        super(DelegatedSubnetProperties, self).__init__(**kwargs)
+        super(DelegatedSubnet, self).__init__(**kwargs)
         self.resource_guid = None
         self.provisioning_state = None
         self.subnet_details = kwargs.get('subnet_details', None)

src/dnc/azext_dnc/vendored_sdks/dnc/models/_models_py3.py

@@ -290,42 +290,6 @@ class DelegatedSubnet(DelegatedSubnetResource):
     :type location: str
     :param tags: A set of tags. The resource tags.
     :type tags: dict[str, str]
-    :param properties: Properties of the provision operation request.
-    :type properties: ~dnc.models.DelegatedSubnetProperties
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'properties': {'key': 'properties', 'type': 'DelegatedSubnetProperties'},
-    }
-
-    def __init__(
-        self,
-        *,
-        location: Optional[str] = None,
-        tags: Optional[Dict[str, str]] = None,
-        properties: Optional["DelegatedSubnetProperties"] = None,
-        **kwargs
-    ):
-        super(DelegatedSubnet, self).__init__(location=location, tags=tags, **kwargs)
-        self.properties = properties
-
-
-class DelegatedSubnetProperties(msrest.serialization.Model):
-    """Properties of delegated subnet.
-
-    Variables are only populated by the server, and will be ignored when sending a request.
-
     :ivar resource_guid: Resource guid.
     :vartype resource_guid: str
     :ivar provisioning_state: The current state of dnc delegated subnet resource. Possible values
@@ -338,25 +302,35 @@ class DelegatedSubnetProperties(msrest.serialization.Model):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'resource_guid': {'readonly': True},
         'provisioning_state': {'readonly': True},
     }
 
     _attribute_map = {
-        'resource_guid': {'key': 'resourceGuid', 'type': 'str'},
-        'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
-        'subnet_details': {'key': 'subnetDetails', 'type': 'SubnetDetails'},
-        'controller_details': {'key': 'controllerDetails', 'type': 'ControllerDetails'},
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'subnet_details': {'key': 'properties.subnetDetails', 'type': 'SubnetDetails'},
+        'controller_details': {'key': 'properties.controllerDetails', 'type': 'ControllerDetails'},
     }
 
     def __init__(
         self,
         *,
+        location: Optional[str] = None,
+        tags: Optional[Dict[str, str]] = None,
         subnet_details: Optional["SubnetDetails"] = None,
         controller_details: Optional["ControllerDetails"] = None,
         **kwargs
     ):
-        super(DelegatedSubnetProperties, self).__init__(**kwargs)
+        super(DelegatedSubnet, self).__init__(location=location, tags=tags, **kwargs)
         self.resource_guid = None
         self.provisioning_state = None
         self.subnet_details = subnet_details

src/dnc/setup.py

@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '0.1.2'
+VERSION = '0.1.3'
 try:
     from azext_dnc.manual.version import VERSION
 except ImportError: