diff options
Diffstat (limited to 'catalog/pub')
| -rw-r--r-- | catalog/pub/Dmaap_lib/dmaap/consumer.py | 3 | ||||
| -rw-r--r-- | catalog/pub/Dmaap_lib/dmaap/identity.py | 3 | ||||
| -rw-r--r-- | catalog/pub/config/config.py | 6 | ||||
| -rw-r--r-- | catalog/pub/msapi/sdc_controller.py | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/catalog/pub/Dmaap_lib/dmaap/consumer.py b/catalog/pub/Dmaap_lib/dmaap/consumer.py index d817b81..d5b5351 100644 --- a/catalog/pub/Dmaap_lib/dmaap/consumer.py +++ b/catalog/pub/Dmaap_lib/dmaap/consumer.py @@ -23,6 +23,7 @@ import requests from catalog.pub.Dmaap_lib.pub.exceptions import DmaapClientException +requests.packages.urllib3.disable_warnings() logger = logging.getLogger(__name__) @@ -75,7 +76,7 @@ class ConsumerClient: url = self.create_url() if self.api_key: headers = self.create_headers() - ret = requests.get(url=url, headers=headers) + ret = requests.get(url=url, headers=headers, verify=False) else: ret = requests.get(url) logger.info("Status code is %s, detail is %s.", ret.status_code, ret.json()) diff --git a/catalog/pub/Dmaap_lib/dmaap/identity.py b/catalog/pub/Dmaap_lib/dmaap/identity.py index 9ca68cd..57f4016 100644 --- a/catalog/pub/Dmaap_lib/dmaap/identity.py +++ b/catalog/pub/Dmaap_lib/dmaap/identity.py @@ -19,6 +19,7 @@ import requests from catalog.pub.Dmaap_lib.pub.exceptions import DmaapClientException +requests.packages.urllib3.disable_warnings() logger = logging.getLogger(__name__) @@ -35,7 +36,7 @@ class IdentityClient: } data = json.JSONEncoder().encode(data) url = self.base_url + "/apiKeys/create" - ret = requests.post(url=url, data=data, headers=headers) + ret = requests.post(url=url, data=data, headers=headers, verify=False) logger.info('create apiKey, response status_code: %s, body: %s', ret.status_code, ret.json()) if ret.status_code != 200: raise DmaapClientException(ret.json()) diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py index 99932d7..2b8f1a0 100644 --- a/catalog/pub/config/config.py +++ b/catalog/pub/config/config.py @@ -88,13 +88,13 @@ CATALOG_ROOT_PATH = None CATALOG_URL_PATH = None # [sdc config] -SDC_BASE_URL = "https://msb-iag/api" +SDC_BASE_URL = MSB_BASE_URL + "/api" SDC_USER = "modeling" SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" # [dmaap config] -DMAAP_MR_IP = '127.0.0.1' -DMAAP_MR_PORT = '3904' +DMAAP_MR_IP = MSB_SERVICE_IP +DMAAP_MR_PORT = '30226' CONSUMER_GROUP = "consumerGroup" CONSUMER_ID = "consumerId" POLLING_INTERVAL = 15 diff --git a/catalog/pub/msapi/sdc_controller.py b/catalog/pub/msapi/sdc_controller.py index 454f3d1..c46503f 100644 --- a/catalog/pub/msapi/sdc_controller.py +++ b/catalog/pub/msapi/sdc_controller.py @@ -18,7 +18,7 @@ from catalog.pub.msapi import sdc logger = logging.getLogger(__name__) -DMAAP_MR_BASE_URL = "http://%s:%s" % (DMAAP_MR_IP, DMAAP_MR_PORT) +DMAAP_MR_BASE_URL = "https://%s:%s" % (DMAAP_MR_IP, DMAAP_MR_PORT) ARTIFACT_TYPES_LIST = ["TOSCA_TEMPLATE", "TOSCA_CSAR"] |