From: Yun Huang Date: Fri, 20 Apr 2018 04:00:38 +0000 (+0800) Subject: Update AAI schema version for ocata X-Git-Tag: v1.1.2~75 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3ade57613f090a54e2444a8e7c426896ad6389dd;p=multicloud%2Fopenstack.git Update AAI schema version for ocata Change-Id: I3c0e10ea28c92dcdc645cf1686e92272b370c607 Issue-ID: MULTICLOUD-179 Signed-off-by: Yun Huang --- diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile index e4d77728..1b8477f3 100644 --- a/ocata/docker/Dockerfile +++ b/ocata/docker/Dockerfile @@ -10,7 +10,7 @@ ENV MSB_ADDR "127.0.0.1" ENV MSB_PORT "80" ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" ENV AAI_PORT "8443" -ENV AAI_SCHEMA_VERSION "v11" +ENV AAI_SCHEMA_VERSION "v13" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py index aea20e9b..5b1780a1 100644 --- a/ocata/ocata/settings.py +++ b/ocata/ocata/settings.py @@ -100,7 +100,7 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-ocata/v0" % ( AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org") AAI_PORT = os.environ.get('AAI_PORT', "8443") AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT) -AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v11") +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") diff --git a/ocata/vagrant/test/Dockerfile b/ocata/vagrant/test/Dockerfile index cc7d2b53..bc306c7a 100644 --- a/ocata/vagrant/test/Dockerfile +++ b/ocata/vagrant/test/Dockerfile @@ -4,7 +4,7 @@ ENV MSB_ADDR "127.0.0.1" ENV MSB_PORT "80" ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" ENV AAI_PORT "8443" -ENV AAI_SCHEMA_VERSION "v11" +ENV AAI_SCHEMA_VERSION "v13" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI"