X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpub%2Fconfig%2Fconfig.py;h=a4a8ce58a155f4b9a3153642437717deb2f28137;hb=3ff968b21a477944ed66b4261f5d9c9a182eb954;hp=b8a5141b4668f98cca681258d2c96baeafb1f3a7;hpb=a32c2b20207885d895bd96204cc166fca14db97b;p=modeling%2Fetsicatalog.git diff --git a/catalog/pub/config/config.py b/catalog/pub/config/config.py index b8a5141..a4a8ce5 100644 --- a/catalog/pub/config/config.py +++ b/catalog/pub/config/config.py @@ -13,20 +13,22 @@ # limitations under the License. # [MSB] +MSB_SERVICE_PROTOCOL = 'https' MSB_SERVICE_IP = '127.0.0.1' MSB_SERVICE_PORT = '80' +MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT) # [REDIS] -REDIS_HOST = '127.0.0.1' -REDIS_PORT = '6379' -REDIS_PASSWD = '' +# REDIS_HOST = '127.0.0.1' +# REDIS_PORT = '6379' +# REDIS_PASSWD = '' # [mysql] DB_IP = "127.0.0.1" DB_PORT = 3306 -DB_NAME = "nfvocatalog" -DB_USER = "nfvocatalog" -DB_PASSWD = "nfvocatalog" +DB_NAME = "etsicatalog" +DB_USER = "etsicatalog" +DB_PASSWD = "etsicatalog" # [MDC] SERVICE_NAME = "catalog" @@ -69,18 +71,30 @@ REG_TO_MSB_REG_PARAM = [{ "port": "8806", "ttl": 0 }] +}, { + "serviceName": "parser", + "version": "v1", + "url": "/api/parser/v1", + "protocol": "REST", + "visualRange": "1", + "nodes": [{ + "ip": "127.0.0.1", + "port": "8806", + "ttl": 0 + }] }] MSB_SVC_CALALOG_URL = "/api/microservices/v1/services/catalog/version/v1" MSB_SVC_NSD_URL = "/api/microservices/v1/services/nsd/version/v1" MSB_SVC_VNFPKGM_URL = "/api/microservices/v1/services/vnfpkgm/version/v1" +MSB_SVC_PARSER_URL = "/api/microservices/v1/services/parser/version/v1" # catalog path(values is defined in settings.py) CATALOG_ROOT_PATH = None CATALOG_URL_PATH = None # [sdc config] -SDC_BASE_URL = "http://msb-iag/api" -SDC_USER = "aai" +SDC_BASE_URL = "https://msb-iag/api" +SDC_USER = "modeling" SDC_PASSWD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" VNFD_SCHEMA_VERSION_DEFAULT = "base"