Issue#3954 (#13)

* changes done after combining specs

* dns record typo error

* zone setting update minfiy setting

Author: KumarGanesanIBM

ibm_cloud_networking_services/zones_settings_v1.py

@@ -246,7 +246,7 @@ def update_zone_cname_flattening(self, *, accept: str = None, value: str = None,
 
     def get_opportunistic_encryption(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get opportunistic encryption setting.
+        Get opportunistic encryption setting.
 
         Get opportunistic encryption setting for a zone.
 
@@ -317,7 +317,7 @@ def update_opportunistic_encryption(self, *, accept: str = None, value: str = No
 
     def get_challenge_ttl(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get challenge TTL setting.
+        Get challenge TTL setting.
 
         Get challenge TTL setting for a zone.
 
@@ -388,7 +388,7 @@ def update_challenge_ttl(self, *, accept: str = None, value: int = None, **kwarg
 
     def get_automatic_https_rewrites(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get automatic https rewrites setting.
+        Get automatic https rewrites setting.
 
         Get automatic https rewrites setting for a zone.
 
@@ -459,7 +459,7 @@ def update_automatic_https_rewrites(self, *, accept: str = None, value: str = No
 
     def get_ture_client_ip(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get true client IP setting.
+        Get true client IP setting.
 
         Get true client IP setting for a zone.
 
@@ -530,7 +530,7 @@ def update_true_client_ip(self, *, accept: str = None, value: str = None, **kwar
 
     def get_always_use_https(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get always use https setting.
+        Get always use https setting.
 
         Get always use https setting for a zone.
 
@@ -601,7 +601,7 @@ def update_always_use_https(self, *, accept: str = None, value: str = None, **kw
 
     def get_image_size_optimization(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get image size optimization setting.
+        Get image size optimization setting.
 
         Get image size optimization setting for a zone.
 
@@ -676,7 +676,7 @@ def update_image_size_optimization(self, *, accept: str = None, value: str = Non
 
     def get_script_load_optimization(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get script load optimization setting.
+        Get script load optimization setting.
 
         Get script load optimization setting for a zone.
 
@@ -747,7 +747,7 @@ def update_script_load_optimization(self, *, accept: str = None, value: str = No
 
     def get_image_load_optimization(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get image load optimizationn setting.
+        Get image load optimizationn setting.
 
         Get image load optimizationn setting for a zone.
 
@@ -818,7 +818,7 @@ def update_image_load_optimization(self, *, accept: str = None, value: str = Non
 
     def get_minify(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get minify setting.
+        Get minify setting.
 
         Get minify setting for a zone.
 
@@ -846,9 +846,7 @@ def get_minify(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         response = self.send(request)
         return response
 
-
-
-    def update_minify(self, *, accept: str = None, css: str = None, html: str = None, js: str = None, **kwargs) -> DetailedResponse:
+    def update_minify(self, *, accept: str = None, value: 'MinifySettingValue' = None, **kwargs) -> DetailedResponse:
         """
         Update minify setting.
 
@@ -862,17 +860,17 @@ def update_minify(self, *, accept: str = None, css: str = None, html: str = None
         :rtype: DetailedResponse with `dict` result representing a `MinifyResp` object
         """
 
+        if value is not None:
+            value = convert_model(value)
         headers = {
             'Accept': accept
         }
         sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='update_minify')
         headers.update(sdk_headers)
 
-        data = {'value': {
-            'css': css,
-            'html': html,
-            'js': js
-        }}
+        data = {
+            'value': value
+        }
         data = {k: v for (k, v) in data.items() if v is not None}
         data = json.dumps(data)
         headers['content-type'] = 'application/json'
@@ -892,7 +890,7 @@ def update_minify(self, *, accept: str = None, css: str = None, html: str = None
 
     def get_min_tls_version(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get minimum TLS version setting.
+        Get minimum TLS version setting.
 
         Get minimum TLS version setting for a zone.
 
@@ -963,7 +961,7 @@ def update_min_tls_version(self, *, accept: str = None, value: str = None, **kwa
 
     def get_ip_geolocation(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get IP geolocation setting.
+        Get IP geolocation setting.
 
         Get IP geolocation setting for a zone.
 
@@ -1034,7 +1032,7 @@ def update_ip_geolocation(self, *, accept: str = None, value: str = None, **kwar
 
     def get_server_side_exclude(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get server side exclude setting.
+        Get server side exclude setting.
 
         Get server side exclude setting for a zone.
 
@@ -1105,7 +1103,7 @@ def update_server_side_exclude(self, *, accept: str = None, value: str = None, *
 
     def get_security_header(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get HTTP strict transport security setting.
+        Get HTTP strict transport security setting.
 
         Get HTTP strict transport security setting for a zone.
 
@@ -1178,7 +1176,7 @@ def update_security_header(self, *, accept: str = None, value: 'SecurityHeaderSe
 
     def get_mobile_redirect(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get mobile redirect setting.
+        Get mobile redirect setting.
 
         Get mobile redirect setting for a zone.
 
@@ -1251,7 +1249,7 @@ def update_mobile_redirect(self, *, accept: str = None, value: 'MobileRedirecSet
 
     def get_prefetch_preload(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get prefetch URLs from header setting.
+        Get prefetch URLs from header setting.
 
         Get prefetch URLs from header setting for a zone.
 
@@ -1322,7 +1320,7 @@ def update_prefetch_preload(self, *, accept: str = None, value: str = None, **kw
 
     def get_http2(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get http/2 setting.
+        Get http/2 setting.
 
         Get http/2 setting for a zone.
 
@@ -1393,7 +1391,7 @@ def update_http2(self, *, accept: str = None, value: str = None, **kwargs) -> De
 
     def get_ipv6(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get IPv6 compatibility setting.
+        Get IPv6 compatibility setting.
 
         Get IPv6 compatibility setting for a zone.
 
@@ -1464,7 +1462,7 @@ def update_ipv6(self, *, accept: str = None, value: str = None, **kwargs) -> Det
 
     def get_web_sockets(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get web sockets setting.
+        Get web sockets setting.
 
         Get web sockets setting for a zone.
 
@@ -1535,7 +1533,7 @@ def update_web_sockets(self, *, accept: str = None, value: str = None, **kwargs)
 
     def get_pseudo_ipv4(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get pseudo IPv4 setting.
+        Get pseudo IPv4 setting.
 
         Get pseudo IPv4 setting for a zone.
 
@@ -1606,7 +1604,7 @@ def update_pseudo_ipv4(self, *, accept: str = None, value: str = None, **kwargs)
 
     def get_response_buffering(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get response buffering setting.
+        Get response buffering setting.
 
         Get response buffering setting for a zone.
 
@@ -1677,7 +1675,7 @@ def update_response_buffering(self, *, accept: str = None, value: str = None, **
 
     def get_hotlink_protection(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get hotlink protection setting.
+        Get hotlink protection setting.
 
         Get hotlink protection setting for a zone.
 
@@ -1748,7 +1746,7 @@ def update_hotlink_protection(self, *, accept: str = None, value: str = None, **
 
     def get_max_upload(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get maximum upload size setting.
+        Get maximum upload size setting.
 
         Get maximum upload size setting for a zone.
 
@@ -1822,7 +1820,7 @@ def update_max_upload(self, *, accept: str = None, value: int = None, **kwargs)
 
     def get_tls_client_auth(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get TLS Client Auth setting.
+        Get TLS Client Auth setting.
 
         Get TLS Client Auth setting for a zone.
 
@@ -1893,7 +1891,7 @@ def update_tls_client_auth(self, *, accept: str = None, value: str = None, **kwa
 
     def get_browser_check(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get browser check setting.
+        Get browser check setting.
 
         Get browser check setting for a zone.
 
@@ -1964,7 +1962,7 @@ def update_browser_check(self, *, accept: str = None, value: str = None, **kwarg
 
     def get_enable_error_pages_on(self, **kwargs) -> DetailedResponse:
         """
-        get enable error pages on setting.
+        Get enable error pages on setting.
 
         Get enable error pages on setting for a zone.
 
@@ -2031,7 +2029,7 @@ def update_enable_error_pages_on(self, *, accept: str = None, value: str = None,
 
     def get_web_application_firewall(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get web application firewall setting.
+        Get web application firewall setting.
 
         Get web application firewall setting for a zone.
 
@@ -2102,7 +2100,7 @@ def update_web_application_firewall(self, *, accept: str = None, value: str = No
 
     def get_ciphers(self, *, accept: str = None, **kwargs) -> DetailedResponse:
         """
-        get ciphers setting.
+        Get ciphers setting.
 
         Get ciphers setting for a zone.
 

test/integration/test_zone_settings_v1.py

@@ -166,14 +166,19 @@ def test_1_minify_setting(self):
         response = self.zonesSettings.get_minify().get_result()
         assert response is not None and response.get('success') is True
         result = response.get('result').get('value')
-        if result.get('css') == 'off':
-            self.value = 'on'
+        if result.get('css') == 'on':
+            self.value = 'off'
         else:
             self.value = 'on'
 
         """ Update minify css setting """
+        self.minfy = {
+            'css': self.value,
+            'html': self.value,
+            'js': self.value
+        }
         response = self.zonesSettings.update_minify(
-            css=self.value, html=self.value, js=self.value).get_result()
+            value=self.minfy).get_result()
         assert response is not None and response.get('success') is True
 
     def test_1_min_tls_setting(self):

test/unit/test_zones_settings_v1.py

@@ -1252,27 +1252,29 @@ def test_update_minify_all_params(self):
                       content_type='*/*',
                       status=200)
 
+        # Construct a dict representation of a MinifySettingValue model
+        minify_setting_value_model =  {
+            'css': 'false',
+            'html': 'false',
+            'js': 'false'
+        }
+
         # Set up parameter values
         accept = 'testString'
-        css = 'false'
-        html = 'false'
-        js = 'false'
+        value = minify_setting_value_model
 
         # Invoke method
         response = service.update_minify(
             accept=accept,
-            css=css,
-            html=html,
-            js=js,
+            value=value,
         )
+
         # Check for correct operation
         assert len(responses.calls) == 1
         assert response.status_code == 200
         # Validate body params
         req_body = json.loads(str(responses.calls[0].request.body, 'utf-8'))
-        assert req_body.get("value")['css'] == css
-        assert req_body.get("value")['html'] == html
-        assert req_body.get("value")['js'] == js
+        assert req_body['value'] == value
 
 
     #--------------------------------------------------------