[AutoPR] containerinstance/resource-manager (#3055)

* Generated from 130558caf04982e77015ceb76133473847b3f061 (#3054)

Fix errors in container group update example

* Adding restart test

* Generated from 5e3cbec47d171de4a66d7303dbc455298817a1e5 (#3265)

Adding new changes to the september swagger

* Packaging update of azure-mgmt-containerinstance

* adding new recording files for updates

* Update settings.json

* ChangeLog

* Generated from 41afecad86851cf0f2955c9042941e245b85d15a (#3285)

Adding ability to use private ip

* Update version.py

Author: AutorestCI

.vscode/settings.json

@@ -2,4 +2,4 @@
     "git.ignoreLimitWarning": true,
     "python.unitTest.pyTestArgs": [],
     "python.unitTest.pyTestEnabled": true
-}
+}

azure-mgmt-containerinstance/HISTORY.rst

@@ -3,6 +3,17 @@
 Release History
 ===============
 
+1.1.0 (2018-09-06)
+++++++++++++++++++
+
+**Features**
+
+- Model LogAnalytics has a new parameter log_type
+- Model LogAnalytics has a new parameter metadata
+- Model ContainerGroup has a new parameter network_profile
+- Added operation ContainerGroupsOperations.stop
+- Added operation ContainerGroupsOperations.restart
+
 1.0.0 (2018-06-13)
 ++++++++++++++++++
 

azure-mgmt-containerinstance/README.rst

@@ -6,7 +6,7 @@ This is the Microsoft Azure Container Instance 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 and 3.6.
+This package has been tested with Python 2.7, 3.4, 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.

azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py

@@ -86,7 +86,7 @@ def __init__(
         super(ContainerInstanceManagementClient, 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 = '2018-06-01'
+        self.api_version = '2018-09-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py

@@ -32,6 +32,7 @@
     from .container_group_properties_instance_view_py3 import ContainerGroupPropertiesInstanceView
     from .log_analytics_py3 import LogAnalytics
     from .container_group_diagnostics_py3 import ContainerGroupDiagnostics
+    from .container_group_network_profile_py3 import ContainerGroupNetworkProfile
     from .container_group_py3 import ContainerGroup
     from .operation_display_py3 import OperationDisplay
     from .operation_py3 import Operation
@@ -67,6 +68,7 @@
     from .container_group_properties_instance_view import ContainerGroupPropertiesInstanceView
     from .log_analytics import LogAnalytics
     from .container_group_diagnostics import ContainerGroupDiagnostics
+    from .container_group_network_profile import ContainerGroupNetworkProfile
     from .container_group import ContainerGroup
     from .operation_display import OperationDisplay
     from .operation import Operation
@@ -84,7 +86,9 @@
     ContainerNetworkProtocol,
     ContainerGroupRestartPolicy,
     ContainerGroupNetworkProtocol,
+    ContainerGroupIpAddressType,
     OperatingSystemTypes,
+    LogAnalyticsLogType,
     ContainerInstanceOperationsOrigin,
 )
 
@@ -111,6 +115,7 @@
     'ContainerGroupPropertiesInstanceView',
     'LogAnalytics',
     'ContainerGroupDiagnostics',
+    'ContainerGroupNetworkProfile',
     'ContainerGroup',
     'OperationDisplay',
     'Operation',
@@ -127,6 +132,8 @@
     'ContainerNetworkProtocol',
     'ContainerGroupRestartPolicy',
     'ContainerGroupNetworkProtocol',
+    'ContainerGroupIpAddressType',
     'OperatingSystemTypes',
+    'LogAnalyticsLogType',
     'ContainerInstanceOperationsOrigin',
 ]

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py

@@ -64,6 +64,10 @@ class ContainerGroup(Resource):
     :param diagnostics: The diagnostic information for a container group.
     :type diagnostics:
      ~azure.mgmt.containerinstance.models.ContainerGroupDiagnostics
+    :param network_profile: The network profile information for a container
+     group.
+    :type network_profile:
+     ~azure.mgmt.containerinstance.models.ContainerGroupNetworkProfile
     """
 
     _validation = {
@@ -91,6 +95,7 @@ class ContainerGroup(Resource):
         'volumes': {'key': 'properties.volumes', 'type': '[Volume]'},
         'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerGroupPropertiesInstanceView'},
         'diagnostics': {'key': 'properties.diagnostics', 'type': 'ContainerGroupDiagnostics'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerGroupNetworkProfile'},
     }
 
     def __init__(self, **kwargs):
@@ -104,3 +109,4 @@ def __init__(self, **kwargs):
         self.volumes = kwargs.get('volumes', None)
         self.instance_view = None
         self.diagnostics = kwargs.get('diagnostics', None)
+        self.network_profile = kwargs.get('network_profile', None)

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile.py

@@ -0,0 +1,34 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ContainerGroupNetworkProfile(Model):
+    """Container group network profile information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. The identifier for a network profile.
+    :type id: str
+    """
+
+    _validation = {
+        'id': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerGroupNetworkProfile, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile_py3.py

@@ -0,0 +1,34 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ContainerGroupNetworkProfile(Model):
+    """Container group network profile information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. The identifier for a network profile.
+    :type id: str
+    """
+
+    _validation = {
+        'id': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str, **kwargs) -> None:
+        super(ContainerGroupNetworkProfile, self).__init__(**kwargs)
+        self.id = id

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py

@@ -64,6 +64,10 @@ class ContainerGroup(Resource):
     :param diagnostics: The diagnostic information for a container group.
     :type diagnostics:
      ~azure.mgmt.containerinstance.models.ContainerGroupDiagnostics
+    :param network_profile: The network profile information for a container
+     group.
+    :type network_profile:
+     ~azure.mgmt.containerinstance.models.ContainerGroupNetworkProfile
     """
 
     _validation = {
@@ -91,9 +95,10 @@ class ContainerGroup(Resource):
         'volumes': {'key': 'properties.volumes', 'type': '[Volume]'},
         'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerGroupPropertiesInstanceView'},
         'diagnostics': {'key': 'properties.diagnostics', 'type': 'ContainerGroupDiagnostics'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerGroupNetworkProfile'},
     }
 
-    def __init__(self, *, containers, os_type, location: str=None, tags=None, image_registry_credentials=None, restart_policy=None, ip_address=None, volumes=None, diagnostics=None, **kwargs) -> None:
+    def __init__(self, *, containers, os_type, location: str=None, tags=None, image_registry_credentials=None, restart_policy=None, ip_address=None, volumes=None, diagnostics=None, network_profile=None, **kwargs) -> None:
         super(ContainerGroup, self).__init__(location=location, tags=tags, **kwargs)
         self.provisioning_state = None
         self.containers = containers
@@ -104,3 +109,4 @@ def __init__(self, *, containers, os_type, location: str=None, tags=None, image_
         self.volumes = volumes
         self.instance_view = None
         self.diagnostics = diagnostics
+        self.network_profile = network_profile

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_instance_management_client_enums.py

@@ -31,12 +31,24 @@ class ContainerGroupNetworkProtocol(str, Enum):
     udp = "UDP"
 
 
+class ContainerGroupIpAddressType(str, Enum):
+
+    public = "Public"
+    private = "Private"
+
+
 class OperatingSystemTypes(str, Enum):
 
     windows = "Windows"
     linux = "Linux"
 
 
+class LogAnalyticsLogType(str, Enum):
+
+    container_insights = "ContainerInsights"
+    container_instance_logs = "ContainerInstanceLogs"
+
+
 class ContainerInstanceOperationsOrigin(str, Enum):
 
     user = "User"

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address.py

@@ -22,9 +22,10 @@ class IpAddress(Model):
 
     :param ports: Required. The list of ports exposed on the container group.
     :type ports: list[~azure.mgmt.containerinstance.models.Port]
-    :ivar type: Required. Specifies if the IP is exposed to the public
-     internet. Default value: "Public" .
-    :vartype type: str
+    :param type: Required. Specifies if the IP is exposed to the public
+     internet. Possible values include: 'Public', 'Private'
+    :type type: str or
+     ~azure.mgmt.containerinstance.models.ContainerGroupIpAddressType
     :param ip: The IP exposed to the public internet.
     :type ip: str
     :param dns_name_label: The Dns name label for the IP.
@@ -35,7 +36,7 @@ class IpAddress(Model):
 
     _validation = {
         'ports': {'required': True},
-        'type': {'required': True, 'constant': True},
+        'type': {'required': True},
         'fqdn': {'readonly': True},
     }
 
@@ -47,11 +48,10 @@ class IpAddress(Model):
         'fqdn': {'key': 'fqdn', 'type': 'str'},
     }
 
-    type = "Public"
-
     def __init__(self, **kwargs):
         super(IpAddress, self).__init__(**kwargs)
         self.ports = kwargs.get('ports', None)
+        self.type = kwargs.get('type', None)
         self.ip = kwargs.get('ip', None)
         self.dns_name_label = kwargs.get('dns_name_label', None)
         self.fqdn = None

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address_py3.py

@@ -22,9 +22,10 @@ class IpAddress(Model):
 
     :param ports: Required. The list of ports exposed on the container group.
     :type ports: list[~azure.mgmt.containerinstance.models.Port]
-    :ivar type: Required. Specifies if the IP is exposed to the public
-     internet. Default value: "Public" .
-    :vartype type: str
+    :param type: Required. Specifies if the IP is exposed to the public
+     internet. Possible values include: 'Public', 'Private'
+    :type type: str or
+     ~azure.mgmt.containerinstance.models.ContainerGroupIpAddressType
     :param ip: The IP exposed to the public internet.
     :type ip: str
     :param dns_name_label: The Dns name label for the IP.
@@ -35,7 +36,7 @@ class IpAddress(Model):
 
     _validation = {
         'ports': {'required': True},
-        'type': {'required': True, 'constant': True},
+        'type': {'required': True},
         'fqdn': {'readonly': True},
     }
 
@@ -47,11 +48,10 @@ class IpAddress(Model):
         'fqdn': {'key': 'fqdn', 'type': 'str'},
     }
 
-    type = "Public"
-
-    def __init__(self, *, ports, ip: str=None, dns_name_label: str=None, **kwargs) -> None:
+    def __init__(self, *, ports, type, ip: str=None, dns_name_label: str=None, **kwargs) -> None:
         super(IpAddress, self).__init__(**kwargs)
         self.ports = ports
+        self.type = type
         self.ip = ip
         self.dns_name_label = dns_name_label
         self.fqdn = None

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py

@@ -21,6 +21,12 @@ class LogAnalytics(Model):
     :type workspace_id: str
     :param workspace_key: Required. The workspace key for log analytics
     :type workspace_key: str
+    :param log_type: The log type to be used. Possible values include:
+     'ContainerInsights', 'ContainerInstanceLogs'
+    :type log_type: str or
+     ~azure.mgmt.containerinstance.models.LogAnalyticsLogType
+    :param metadata: Metadata for log analytics.
+    :type metadata: dict[str, str]
     """
 
     _validation = {
@@ -31,9 +37,13 @@ class LogAnalytics(Model):
     _attribute_map = {
         'workspace_id': {'key': 'workspaceId', 'type': 'str'},
         'workspace_key': {'key': 'workspaceKey', 'type': 'str'},
+        'log_type': {'key': 'logType', 'type': 'str'},
+        'metadata': {'key': 'metadata', 'type': '{str}'},
     }
 
     def __init__(self, **kwargs):
         super(LogAnalytics, self).__init__(**kwargs)
         self.workspace_id = kwargs.get('workspace_id', None)
         self.workspace_key = kwargs.get('workspace_key', None)
+        self.log_type = kwargs.get('log_type', None)
+        self.metadata = kwargs.get('metadata', None)

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py

@@ -21,6 +21,12 @@ class LogAnalytics(Model):
     :type workspace_id: str
     :param workspace_key: Required. The workspace key for log analytics
     :type workspace_key: str
+    :param log_type: The log type to be used. Possible values include:
+     'ContainerInsights', 'ContainerInstanceLogs'
+    :type log_type: str or
+     ~azure.mgmt.containerinstance.models.LogAnalyticsLogType
+    :param metadata: Metadata for log analytics.
+    :type metadata: dict[str, str]
     """
 
     _validation = {
@@ -31,9 +37,13 @@ class LogAnalytics(Model):
     _attribute_map = {
         'workspace_id': {'key': 'workspaceId', 'type': 'str'},
         'workspace_key': {'key': 'workspaceKey', 'type': 'str'},
+        'log_type': {'key': 'logType', 'type': 'str'},
+        'metadata': {'key': 'metadata', 'type': '{str}'},
     }
 
-    def __init__(self, *, workspace_id: str, workspace_key: str, **kwargs) -> None:
+    def __init__(self, *, workspace_id: str, workspace_key: str, log_type=None, metadata=None, **kwargs) -> None:
         super(LogAnalytics, self).__init__(**kwargs)
         self.workspace_id = workspace_id
         self.workspace_key = workspace_key
+        self.log_type = log_type
+        self.metadata = metadata

azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py

@@ -23,7 +23,7 @@ class ContainerGroupUsageOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API version. Constant value: "2018-06-01".
+    :ivar api_version: Client API version. Constant value: "2018-09-01".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-06-01"
+        self.api_version = "2018-09-01"
 
         self.config = config
 
@@ -67,7 +67,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -76,8 +76,8 @@ def list(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)