Add default setting value

Rebase to newton_base for reusing codes

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

diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 036ce9c..efb0296 100644 (file)
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -128,12 +128,12 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-ocata/v0" % (
     MSB_SERVICE_ADDR, MSB_SERVICE_PORT)
 
 # [A&AI]
-AAI_ADDR = os.environ.get('AAI_ADDR', "")
-AAI_PORT = os.environ.get('AAI_PORT', "")
+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', "")
-AAI_USERNAME = os.environ.get('AAI_USERNAME', "")
-AAI_PASSWORD = os.environ.get('AAI_PASSWORD', "")
+AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v11")
+AAI_USERNAME = os.environ.get('AAI_USERNAME', "AAI")
+AAI_PASSWORD = os.environ.get('AAI_PASSWORD', "AAI")
 
 AAI_BASE_URL = "%s/%s" % (AAI_SERVICE_URL, AAI_SCHEMA_VERSION)
 

diff --git a/ocata/ocata/swagger/views.py b/ocata/ocata/swagger/views.py
index d0eda8f..42f596a 100644 (file)
--- a/ocata/ocata/swagger/views.py
+++ b/ocata/ocata/swagger/views.py
@@ -21,7 +21,7 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from newton.pub.exceptions import VimDriverNewtonException
+from common.exceptions import VimDriverNewtonException
 from newton_base.swagger import views as newton_json_view
 
 logger = logging.getLogger(__name__)

diff --git a/ocata/ocata/urls.py b/ocata/ocata/urls.py
index c130583..b1d198d 100644 (file)
--- a/ocata/ocata/urls.py
+++ b/ocata/ocata/urls.py
@@ -15,7 +15,7 @@
 from django.conf.urls import include, url
 
 from ocata.registration.views import registration
-from newton.requests.views import tenants
+from newton_base.openoapi import tenants
 
 urlpatterns = [
     url(r'^', include('ocata.swagger.urls')),