Travis build integration (#2)

* travis releated changes

* travis test (#1)

* travis test

* travis script update

* test1

* PR changes for travis

* job commit

* travis PR changes

* test (#2)

* test

* test

* travis changes

* travis script changes

* test1

* flick switch to off

* travis copy file

* script update

* indent on script

* copy of platform services

* import changes

* changed env file and custom page services

* ssl failure changes and changed rerun 2

* ApiException import

* pdns changes and ssl error in time import

* pagination support

Author: KumarGanesanIBM

.env.enc

@@ -4,67 +4,22 @@ dist: xenial
 
 cache: pip
 
-notifications:
-  email: true
-
-# After creating your SDK project from this template repository,
-# uncomment this section to enable builds on the appropriate python versions.
-# matrix:
-#   include:
-#     - python: 3.5
-#     - python: 3.6
-#     - python: 3.7
-#     - python: 3.8
+matrix:
+  include:
+    - python: 3.7
+      before_script:
+      - >-
+            [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]
+            && openssl aes-256-cbc -K $encrypted_3c84dcdc6bbe_key -iv $encrypted_3c84dcdc6bbe_iv -in .env.enc -out .env -d
+            || true
 
 before_install:
   - npm install npm@latest -g
   - sudo apt-get update
   - sudo apt-get install pandoc
   - pip install pypandoc
-# - '[ "${TRAVIS_PULL_REQUEST}" == "false" ] && openssl aes-256-cbc -K $my_key -iv $my_iv -in myservice.env.enc -out myservice.env -d || true'
 
 install:
   - pip install tox-travis
 
 script: tox
-
-# After creating your SDK project from this template repository,
-# remove this entire "jobs" section as this is only applicable
-# to the template repo's travis build.
-jobs:
-  include:
-    - stage: Run tox tests
-      python: "3.5"
-    - python: "3.6"
-    - python: "3.7"
-    - python: "3.8"
-    - stage: Run system test with template
-      script:
-        - git clone [email protected]:CloudEngineering/sdkgen-systest.git
-        - cd sdkgen-systest
-        - ./install_scripts/install_deps_ubuntu.sh
-        - ./setup_and_generate.sh -l ibm-python -t $TRAVIS_BRANCH
-# To enable semantic-release, uncomment these sections.
-# before_deploy:
-# - pip install bump2version
-# - nvm install 12
-# - npm install @semantic-release/changelog
-# - npm install @semantic-release/exec
-# - npm install @semantic-release/git
-# - npm install @semantic-release/github
-#
-# deploy:
-# - provider: script
-#   script: npx semantic-release
-#   skip_cleanup: true
-#   on:
-#     python: '3.5'
-#     branch: master
-# - provider: pypi
-#   user: __token__
-#   password: $PYPI_TOKEN
-#   repository: https://upload.pypi.org/legacy
-#   skip_cleanup: true
-#   on:
-#     python: '3.5'
-#     tags: true

.travis.yml

@@ -75,17 +75,17 @@ def __init__(self,
     #########################
 
 
-    def list_dnszones(self, instance_id: str, *, x_correlation_id: str = None, offset: str = None, limit: str = None, vpc_id: str = None, **kwargs) -> DetailedResponse:
+    def list_dnszones(self, instance_id: str, *, x_correlation_id: str = None, offset: int = None, limit: int = None, vpc_id: str = None, **kwargs) -> DetailedResponse:
         """
         List DNS zones.
 
         List the DNS zones for a given service instance.
 
         :param str instance_id: The unique identifier of a service instance.
         :param str x_correlation_id: (optional) Uniquely identifying a request.
-        :param str offset: (optional) Specify how many DNS zones to skip over, the
+        :param int offset: (optional) Specify how many DNS zones to skip over, the
                default value is 0.
-        :param str limit: (optional) Specify how many DNS zones are returned, the
+        :param int limit: (optional) Specify how many DNS zones are returned, the
                default value is 10.
         :param str vpc_id: (optional) Specify the VPC instance id.
         :param dict headers: A `dict` containing the request headers

ibm_cloud_networking_services/dns_zones_v1.py

@@ -121,7 +121,7 @@ def list_permitted_networks(self, instance_id: str, dnszone_id: str, *, x_correl
         return response
 
 
-    def create_permitted_networks(self, instance_id: str, dnszone_id: str, *, type: str = None, permitted_network: 'PermittedNetworkVpc' = None, x_correlation_id: str = None, **kwargs) -> DetailedResponse:
+    def create_permitted_network(self, instance_id: str, dnszone_id: str, *, type: str = None, permitted_network: 'PermittedNetworkVpc' = None, x_correlation_id: str = None, **kwargs) -> DetailedResponse:
         """
         Create a permitted network.
 
@@ -147,7 +147,7 @@ def create_permitted_networks(self, instance_id: str, dnszone_id: str, *, type:
         headers = {
             'X-Correlation-ID': x_correlation_id
         }
-        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='create_permitted_networks')
+        sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME, service_version='V1', operation_id='create_permitted_network')
         headers.update(sdk_headers)
 
         data = {

ibm_cloud_networking_services/permitted_networks_for_dns_zones_v1.py

@@ -7,7 +7,7 @@
 
 import os
 import unittest
-from ibm_cloud_pdns_services.dns_zones_v1 import DnsZonesV1
+from ibm_cloud_networking_services import DnsZonesV1
 
 
 class TestZonesV1(unittest.TestCase):
@@ -18,6 +18,8 @@ def setUp(self):
         self.instance_id = os.getenv("INSTANCE_ID")
         # create zone class object
         self.zone = DnsZonesV1.new_instance(service_name="pdns_services")
+        # Delete the resources
+        self._clean_dns_zones()
 
     def tearDown(self):
         """ tear down """
@@ -30,10 +32,12 @@ def _clean_dns_zones(self):
         response = self.zone.list_dnszones(instance_id=self.instance_id)
         assert response is not None
         assert response.status_code == 200
-        result = response.get_result().get("dnszones")
-        for zone in result:
-            print(zone.get("id"))
-            self.zone.delete_dnszone(instance_id=self.instance_id, dnszone_id=zone.get("id"))
+        result = response.get_result()
+        if result is not None:
+            zones = result.get("dnszones")
+            for zone in zones:
+                print(zone.get("id"))
+                self.zone.delete_dnszone(instance_id=self.instance_id, dnszone_id=zone.get("id"))
 
     def test_1_pdns_zone_action(self):
         """ test private dns zone create/delete/update/get functionality """
@@ -93,7 +97,20 @@ def test_1_pdns_zone_list(self):
         assert resp is not None
         assert resp.status_code == 200
 
-        resp = self.zone.list_dnszones(instance_id=self.instance_id)
+        name = "test.example36.com"
+        # create dns zone
+        resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
+        assert resp is not None
+        assert resp.status_code == 200
+
+        name = "test.example37.com"
+        # create dns zone
+        resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
+        assert resp is not None
+        assert resp.status_code == 200
+
+
+        resp = self.zone.list_dnszones(instance_id=self.instance_id, offset=1, limit=2)
         assert resp is not None
         assert resp.status_code == 200
 

test/integration/test_dns_zones_v1.py

@@ -7,8 +7,8 @@
 
 import os
 import unittest
-from ibm_cloud_pdns_services.dns_zones_v1 import DnsZonesV1
-from ibm_cloud_pdns_services.permitted_networks_for_dns_zones_v1 import PermittedNetworksForDnsZonesV1
+from ibm_cloud_networking_services import DnsZonesV1
+from ibm_cloud_networking_services import PermittedNetworksForDnsZonesV1
 
 
 class TestPermittedNetworksForDnsZonesV1(unittest.TestCase):
@@ -56,7 +56,7 @@ def test_1_permitted_network_actions(self):
             'vpc_crn': self.vpc_crn
         }
         # permit = [pnw]
-        resp = self.nw.create_permitted_networks(
+        resp = self.nw.create_permitted_network(
             instance_id=self.instance_id, dnszone_id=self.zone_id, type='vpc', permitted_network=pnw)
         assert resp is not None
         assert resp.status_code == 200

test/integration/test_permitted_networks_for_dns_zones_v1.py

@@ -7,8 +7,8 @@
 
 import os
 import unittest
-from ibm_cloud_pdns_services.dns_zones_v1 import DnsZonesV1
-from ibm_cloud_pdns_services.resource_records_v1 import ResourceRecordsV1
+from ibm_cloud_networking_services import DnsZonesV1
+from ibm_cloud_networking_services import ResourceRecordsV1
 
 
 class TestResourceRecordsV1(unittest.TestCase):

test/integration/test_resources_records_v1.py

@@ -7,7 +7,9 @@
 
 import os
 import unittest
+import time
 from ibm_cloud_networking_services import SslCertificateApiV1
+from ibm_cloud_sdk_core import ApiException
 
 
 class TestSSLCertV1(unittest.TestCase):
@@ -18,13 +20,15 @@ def setUp(self):
         self.crn = os.getenv("CRN")
         self.zone_id = os.getenv("ZONE_ID")
         self.endpoint = os.getenv("API_ENDPOINT")
+        self.url = os.getenv("URL")
         self.ssl = SslCertificateApiV1.new_instance(
             crn=self.crn, zone_identifier=self.zone_id, service_name="cis_services")
         self.ssl.set_service_url(self.endpoint)
         self.certificate = os.getenv("CERTIFICATE")
         self.private_key = os.getenv("PRIVATE_KEY")
         self.update_certificate = os.getenv("UPDATE_CERTIFICATE")
         self.update_private_key = os.getenv("UPDATE_PRIVATE_KEY")
+        self._clean_ssl_certificates()
 
     def tearDown(self):
         """ tear down """
@@ -37,7 +41,13 @@ def _clean_ssl_certificates(self):
         certs = resp.get_result().get("result")
         for cert in certs:
             print("ssl certificate id", cert.get("id"))
-            self.ssl.delete_certificate(cert.get("id"))
+            try:
+                self.ssl.delete_certificate(cert.get("id"))
+            except ApiException:
+                print ('Error: Bad response certificate service, Code: 400')
+                # deleting ssl certificate will be pending state for a while.
+                # So, wait for 60 sec and re-run the test.
+                time.sleep(60)
 
     def test_1_list_certificates(self):
         """ test method list all ssl certificate packs """
@@ -49,7 +59,7 @@ def test_1_certificate_actions(self):
         """ test method for order/view/delete ssl certificate packs """
         # order certificate
         resp = self.ssl.order_certificate(
-            x_correlation_id="1234", type="dedicated", hosts=["sdk.cistest-load.com"])
+            x_correlation_id="1234", type="dedicated", hosts=[self.url])
         assert resp is not None
         assert resp.status_code == 200
         cert_id = resp.get_result().get("result")["id"]

test/integration/test_ssl_certificate_api_v1.py

@@ -20,7 +20,7 @@
 import pytest
 import requests
 import responses
-from ibm_cloud_networking_services import *
+from ibm_cloud_networking_services.dns_zones_v1 import *
 
 
 service = DnsZonesV1(
@@ -57,8 +57,8 @@ def test_list_dnszones_all_params(self):
         # Set up parameter values
         instance_id = 'testString'
         x_correlation_id = 'testString'
-        offset = 'testString'
-        limit = 'testString'
+        offset = 38
+        limit = 38
         vpc_id = 'testString'
 
         # Invoke method