Merge branch 'master' of https://github.com/IBM/networking-python-sdk into dl-100g

Author: ajay-malhotra1

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.1
+current_version = 0.4.2
 commit = True
 message = Update version {current_version} -> {new_version}
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.4.2](https://github.com/IBM/networking-python-sdk/compare/v0.4.1...v0.4.2) (2021-05-04)
+
+
+### Bug Fixes
+
+* Fix for ssl_certificate and zone_firewall_acess_rules integration tests ([a4e77b5](https://github.com/IBM/networking-python-sdk/commit/a4e77b5f41d881a4a7d946e5960350fd7e52edaa))
+
 ## [0.4.1](https://github.com/IBM/networking-python-sdk/compare/v0.4.0...v0.4.1) (2020-12-20)
 
 

README.md

@@ -7,7 +7,7 @@
 [![codecov](https://codecov.io/gh/IBM/networking-python-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/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.4.1
+# IBM Cloud Networking Services Python SDK Version 0.4.2
 
 Python client library to interact with various [IBM Cloud Networking Service APIs](https://cloud.ibm.com/apidocs?category=network).
 
@@ -100,13 +100,13 @@ IBM Cloud services:
 To install, use `pip` or `easy_install`:
 
 ```bash
-pip install --upgrade "ibm-cloud-networking-services==0.4.1"
+pip install --upgrade "ibm-cloud-networking-services==0.4.2"
 ```
 
 or
 
 ```bash
-easy_install --upgrade "ibm-cloud-networking-servies==0.4.1"
+easy_install --upgrade "ibm-cloud-networking-servies==0.4.2"
 ```
 
 ## Using the SDK

ibm_cloud_networking_services/version.py

@@ -1,4 +1,4 @@
 """
 Version of cloud_networking_services
 """
-__version__ = '0.4.1'
+__version__ = '0.4.2'

package-lock.json

@@ -19,7 +19,7 @@
 import sys
 import pkg_resources
 
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 PACKAGE_NAME = 'ibm_cloud_networking_services'
 PACKAGE_DESC = 'Python client library for IBM Cloud Networking Services'
 

setup.py

@@ -75,7 +75,7 @@ def test_1_certificate_actions(self):
         resp = self.ssl.order_certificate(
             x_correlation_id="1234", type="dedicated", hosts=[self.url])
         assert resp is not None
-        assert resp.status_code == 200
+        assert resp.status_code == 200 or resp.status_code == 201
         cert_id = resp.get_result().get("result")["id"]
 
         # delete certificate

test/integration/test_ssl_certificate_api_v1.py

@@ -34,11 +34,26 @@ def setUp(self):
             crn=self.crn, zone_identifier=self.zone_id, service_name="cis_services")
         self.rule.set_service_url(self.endpoint)
 
+        # list all rules and delete the same for clean up
+        self._clean_zone_firewall_rules()
+
     def tearDown(self):
         """ tear down """
         # Delete the resources
+        self._clean_zone_firewall_rules()
         print("Clean up complete")
 
+    def _clean_zone_firewall_rules(self):
+        resp = self.rule.list_all_zone_access_rules()
+        assert resp is not None
+        assert resp.status_code == 200
+        for result in resp.get_result().get("result"):
+            rule_id = result['id']
+            resp = self.rule.delete_zone_access_rule(
+                accessrule_identifier=rule_id)
+            assert resp is not None
+            assert resp.status_code == 200
+
     def test_1_zone_firewall_rule_mode_action(self):
         i = 0
         modes = {