CIS code update after combining specs (#12)

* changes done after combining specs

* dns record typo error

Author: KumarGanesanIBM

MANIFEST.in

@@ -0,0 +1,3 @@
+include LICENSE
+include requirements.txt
+include requirements-dev.txt

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis.ibm.com/CloudEngineering/python-sdk-template.svg?token=eW5FVD71iyte6tTby8gr&branch=master)](https://travis.ibm.com/CloudEngineering/python-sdk-template)
+[![Build Status](https://travis.ibm.com/CloudEngineering/python-sdk-template.svg?token=eW5FVD71iyte6tTby8gr&branch=master)](https://travis.ibm.com/ibmcloud/networking-python-sdk)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
 # IBM Cloud Networking Services Python SDK Version 0.0.1

ibm_cloud_networking_services/caching_api_v1.py

@@ -74,9 +74,9 @@ def __init__(self,
 
     def list_ips(self, **kwargs) -> DetailedResponse:
         """
-        List all IPs.
+        List of all IP addresses used by the CIS proxy.
 
-        List of all IP addresses.
+        List of all IP addresses used by the CIS proxy.
 
         :param dict headers: A `dict` containing the request headers
         :return: A `DetailedResponse` containing the result, headers and HTTP status code.

ibm_cloud_networking_services/cis_ip_api_v1.py

@@ -97,7 +97,7 @@ def __init__(self,
 
 
     #########################
-    # List instance custom pages
+    # Custom Pages
     #########################
 
 
@@ -127,10 +127,6 @@ def list_instance_custom_pages(self, **kwargs) -> DetailedResponse:
         response = self.send(request)
         return response
 
-    #########################
-    # Get a custom page for a given instance
-    #########################
-
 
     def get_instance_custom_page(self, page_identifier: str, **kwargs) -> DetailedResponse:
         """
@@ -161,10 +157,6 @@ def get_instance_custom_page(self, page_identifier: str, **kwargs) -> DetailedRe
         response = self.send(request)
         return response
 
-    #########################
-    # Update a custom page for a given instance
-    #########################
-
 
     def update_instance_custom_page(self, page_identifier: str, *, url: str = None, state: str = None, **kwargs) -> DetailedResponse:
         """
@@ -206,10 +198,6 @@ def update_instance_custom_page(self, page_identifier: str, *, url: str = None,
         response = self.send(request)
         return response
 
-    #########################
-    # List zone custom pages
-    #########################
-
 
     def list_zone_custom_pages(self, **kwargs) -> DetailedResponse:
         """
@@ -237,10 +225,6 @@ def list_zone_custom_pages(self, **kwargs) -> DetailedResponse:
         response = self.send(request)
         return response
 
-    #########################
-    # Get a custom page for a given zone
-    #########################
-
 
     def get_zone_custom_page(self, page_identifier: str, **kwargs) -> DetailedResponse:
         """
@@ -271,10 +255,6 @@ def get_zone_custom_page(self, page_identifier: str, **kwargs) -> DetailedRespon
         response = self.send(request)
         return response
 
-    #########################
-    # Update a custom page for a given zone
-    #########################
-
 
     def update_zone_custom_page(self, page_identifier: str, *, url: str = None, state: str = None, **kwargs) -> DetailedResponse:
         """

ibm_cloud_networking_services/custom_pages_v1.py

@@ -94,71 +94,66 @@ def __init__(self,
 
 
     #########################
-    # Import zone files
+    # dNSRecords
     #########################
 
 
-    def post_dns_records_bulk(self, *, file: BinaryIO = None, file_content_type: str = None, **kwargs) -> DetailedResponse:
+    def get_dns_records_bulk(self, **kwargs) -> DetailedResponse:
         """
-        Import zone file.
+        Export zone file.
 
-        Import zone file.
+        Export zone file.
 
-        :param BinaryIO file: (optional) file to upload.
-        :param str file_content_type: (optional) The content type of file.
         :param dict headers: A `dict` containing the request headers
         :return: A `DetailedResponse` containing the result, headers and HTTP status code.
-        :rtype: DetailedResponse with `dict` result representing a `DnsRecordsObject` object
+        :rtype: DetailedResponse with `BinaryIO` result
         """
 
         headers = {}
-        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='post_dns_records_bulk')
+        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_dns_records_bulk')
         headers.update(sdk_headers)
 
-        form_data = []
-        if file:
-            form_data.append(('file', (None, file, file_content_type or 'application/octet-stream')))
-
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
 
         url = '/v1/{0}/zones/{1}/dns_records_bulk'.format(*self.encode_path_vars(self.crn, self.zone_identifier))
-        request = self.prepare_request(method='POST',
+        request = self.prepare_request(method='GET',
                                        url=url,
-                                       headers=headers,
-                                       files=form_data)
+                                       headers=headers)
 
         response = self.send(request)
         return response
 
-    #########################
-    # Export zone files
-    #########################
-
 
-    def get_dns_records_bulk(self, **kwargs) -> DetailedResponse:
+    def post_dns_records_bulk(self, *, file: BinaryIO = None, file_content_type: str = None, **kwargs) -> DetailedResponse:
         """
-        Export zone file.
+        Import zone file.
 
-        Export zone file.
+        Import zone file.
 
+        :param BinaryIO file: (optional) file to upload.
+        :param str file_content_type: (optional) The content type of file.
         :param dict headers: A `dict` containing the request headers
         :return: A `DetailedResponse` containing the result, headers and HTTP status code.
-        :rtype: DetailedResponse with `BinaryIO` result
+        :rtype: DetailedResponse with `dict` result representing a `DnsRecordsObject` object
         """
 
         headers = {}
-        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_dns_records_bulk')
+        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='post_dns_records_bulk')
         headers.update(sdk_headers)
 
+        form_data = []
+        if file:
+            form_data.append(('file', (None, file, file_content_type or 'application/octet-stream')))
+
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
 
         url = '/v1/{0}/zones/{1}/dns_records_bulk'.format(*self.encode_path_vars(self.crn, self.zone_identifier))
-        request = self.prepare_request(method='GET',
+        request = self.prepare_request(method='POST',
                                        url=url,
-                                       headers=headers)
+                                       headers=headers,
+                                       files=form_data)
 
         response = self.send(request)
-        return response
-
+        return response

ibm_cloud_networking_services/dns_record_bulk_v1.py

@@ -95,7 +95,7 @@ def __init__(self,
 
 
     #########################
-    # List all DNS records
+    # DNS Records
     #########################
 
 
@@ -147,44 +147,6 @@ def list_all_dns_records(self, *, type: str = None, name: str = None, content: s
         response = self.send(request)
         return response
 
-    #########################
-    # Get a DNS record
-    #########################
-
-
-    def get_dns_record(self, dnsrecord_identifier: str, **kwargs) -> DetailedResponse:
-        """
-        Get a DNS record.
-
-        Get the details of a DNS record for a given zone under a given service instance.
-
-        :param str dnsrecord_identifier: Identifier of DNS record.
-        :param dict headers: A `dict` containing the request headers
-        :return: A `DetailedResponse` containing the result, headers and HTTP status code.
-        :rtype: DetailedResponse with `dict` result representing a `DnsrecordResp` object
-        """
-
-        if dnsrecord_identifier is None:
-            raise ValueError('dnsrecord_identifier must be provided')
-        headers = {}
-        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_dns_record')
-        headers.update(sdk_headers)
-
-        if 'headers' in kwargs:
-            headers.update(kwargs.get('headers'))
-
-        url = '/v1/{0}/zones/{1}/dns_records/{2}'.format(*self.encode_path_vars(self.crn, self.zone_identifier, dnsrecord_identifier))
-        request = self.prepare_request(method='GET',
-                                       url=url,
-                                       headers=headers)
-
-        response = self.send(request)
-        return response
-
-    #########################
-    # Create a DNS record
-    #########################
-
 
     def create_dns_record(self, *, type: str = None, name: str = None, content: str = None, priority: int = None, data: object = None, **kwargs) -> DetailedResponse:
         """
@@ -229,9 +191,65 @@ def create_dns_record(self, *, type: str = None, name: str = None, content: str
         response = self.send(request)
         return response
 
-    #########################
-    # Update a DNS record
-    #########################
+
+    def delete_dns_record(self, dnsrecord_identifier: str, **kwargs) -> DetailedResponse:
+        """
+        Delete a DNS record.
+
+        Delete a DNS record given its id.
+
+        :param str dnsrecord_identifier: Identifier of DNS record.
+        :param dict headers: A `dict` containing the request headers
+        :return: A `DetailedResponse` containing the result, headers and HTTP status code.
+        :rtype: DetailedResponse with `dict` result representing a `DeleteDnsrecordResp` object
+        """
+
+        if dnsrecord_identifier is None:
+            raise ValueError('dnsrecord_identifier must be provided')
+        headers = {}
+        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='delete_dns_record')
+        headers.update(sdk_headers)
+
+        if 'headers' in kwargs:
+            headers.update(kwargs.get('headers'))
+
+        url = '/v1/{0}/zones/{1}/dns_records/{2}'.format(*self.encode_path_vars(self.crn, self.zone_identifier, dnsrecord_identifier))
+        request = self.prepare_request(method='DELETE',
+                                       url=url,
+                                       headers=headers)
+
+        response = self.send(request)
+        return response
+
+
+    def get_dns_record(self, dnsrecord_identifier: str, **kwargs) -> DetailedResponse:
+        """
+        Get a DNS record.
+
+        Get the details of a DNS record for a given zone under a given service instance.
+
+        :param str dnsrecord_identifier: Identifier of DNS record.
+        :param dict headers: A `dict` containing the request headers
+        :return: A `DetailedResponse` containing the result, headers and HTTP status code.
+        :rtype: DetailedResponse with `dict` result representing a `DnsrecordResp` object
+        """
+
+        if dnsrecord_identifier is None:
+            raise ValueError('dnsrecord_identifier must be provided')
+        headers = {}
+        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='get_dns_record')
+        headers.update(sdk_headers)
+
+        if 'headers' in kwargs:
+            headers.update(kwargs.get('headers'))
+
+        url = '/v1/{0}/zones/{1}/dns_records/{2}'.format(*self.encode_path_vars(self.crn, self.zone_identifier, dnsrecord_identifier))
+        request = self.prepare_request(method='GET',
+                                       url=url,
+                                       headers=headers)
+
+        response = self.send(request)
+        return response
 
 
     def update_dns_record(self, dnsrecord_identifier: str, *, type: str = None, name: str = None, content: str = None, priority: int = None, proxied: bool = None, data: object = None, **kwargs) -> DetailedResponse:
@@ -282,40 +300,6 @@ def update_dns_record(self, dnsrecord_identifier: str, *, type: str = None, name
         response = self.send(request)
         return response
 
-    #########################
-    # Delete a DNS record
-    #########################
-
-
-    def delete_dns_record(self, dnsrecord_identifier: str, **kwargs) -> DetailedResponse:
-        """
-        Delete a DNS record.
-
-        Delete a DNS record given its id.
-
-        :param str dnsrecord_identifier: Identifier of DNS record.
-        :param dict headers: A `dict` containing the request headers
-        :return: A `DetailedResponse` containing the result, headers and HTTP status code.
-        :rtype: DetailedResponse with `dict` result representing a `DeleteDnsrecordResp` object
-        """
-
-        if dnsrecord_identifier is None:
-            raise ValueError('dnsrecord_identifier must be provided')
-        headers = {}
-        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='delete_dns_record')
-        headers.update(sdk_headers)
-
-        if 'headers' in kwargs:
-            headers.update(kwargs.get('headers'))
-
-        url = '/v1/{0}/zones/{1}/dns_records/{2}'.format(*self.encode_path_vars(self.crn, self.zone_identifier, dnsrecord_identifier))
-        request = self.prepare_request(method='DELETE',
-                                       url=url,
-                                       headers=headers)
-
-        response = self.send(request)
-        return response
-
 
 class ListAllDnsRecordsEnums:
     """
@@ -343,4 +327,3 @@ class Match(Enum):
         """
         ANY = 'any'
         ALL = 'all'
-