From: Yun Huang <yun.huang@windriver.com>
Date: Tue, 12 Jun 2018 09:15:08 +0000 (+0800)
Subject: Provide default value for AAI_SERVICE_URL
X-Git-Tag: 1.2.0~113
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F51155%2F2;p=multicloud%2Fopenstack.git

Provide default value for AAI_SERVICE_URL

In the MultiCloud HPA CSIT, the setup.sh script requires to control
the value of AAI_SERVICE_URL in order to avoid the use of certificates.
when AAI_SERVICE_URL not be set by CSIT, the system need to provide
a default value.

Change-Id: I70dd7074162f75d2d26aa6580da454ea369910ce
Issue-ID: MULTICLOUD-244
Signed-off-by: Yun Huang <yun.huang@windriver.com>
---

diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 79344374..f9f040ba 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -100,7 +100,11 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-ocata/v0" % (
 # [A&AI]
 AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org")
 AAI_PORT = os.environ.get('AAI_PORT', "8443")
-AAI_SERVICE_URL = os.environ.get('AAI_SERVICE_URL', 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT))
+
+AAI_SERVICE_URL = os.environ.get('AAI_SERVICE_URL', "")
+if AAI_SERVICE_URL == "":
+    AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT)
+
 AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v13")
 AAI_USERNAME = os.environ.get('AAI_USERNAME', "AAI")
 AAI_PASSWORD = os.environ.get('AAI_PASSWORD', "AAI")