From 9e7c5a6bfd338dd5352d9d6afdae0cea23856acf Mon Sep 17 00:00:00 2001
From: Huang Haibin <haibin.huang@intel.com>
Date: Wed, 17 Jan 2018 06:06:27 +0800
Subject: Add newton base directory

newton base directory is mainly placed openstack public files, we
will move mainly from the original newton folder.this patch create
newton base framework and move one file to here.

Issue-ID: MULTICLOUD-138
Change-Id: Ie901795a5cf3383217c3585eb6602a4baba6dcd8
Signed-off-by: Huang Haibin <haibin.huang@intel.com>
---
 ocata/assembly.xml                  | 14 +++++++++++++-
 ocata/ocata/proxy/views/services.py |  4 ++--
 ocata/ocata/settings.py             |  5 ++++-
 ocata/run.sh                        |  4 ++--
 ocata/tox.ini                       |  2 +-
 5 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'ocata')

diff --git a/ocata/assembly.xml b/ocata/assembly.xml
index 7ae321af..e60dd7fd 100644
--- a/ocata/assembly.xml
+++ b/ocata/assembly.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (c) 2017 Wind River Systems, Inc.
+ Copyright (c) 2017-2018 Wind River Systems, Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -30,6 +30,18 @@
                 <include>**/*.bpel</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>../share</directory>
+            <outputDirectory>/lib/share</outputDirectory>
+            <includes>
+                <include>**/*.py</include>
+                <include>**/*.json</include>
+                <include>**/*.xml</include>
+                <include>**/*.wsdl</include>
+                <include>**/*.xsd</include>
+                <include>**/*.bpel</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>logs</directory>
             <outputDirectory>/logs</outputDirectory>
diff --git a/ocata/ocata/proxy/views/services.py b/ocata/ocata/proxy/views/services.py
index 7eb6bd25..d65da20a 100644
--- a/ocata/ocata/proxy/views/services.py
+++ b/ocata/ocata/proxy/views/services.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ import logging
 from rest_framework import status
 
 from ocata.pub.config import config
-from newton.proxy.views import services as newton_services
+from newton_base.proxy import services as newton_services
 
 logger = logging.getLogger(__name__)
 
diff --git a/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 3cc4caa9..6021aa78 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,6 +114,9 @@ CACHES = {
     }
 }
 
+OPENSTACK_VERSION = "ocata"
+MULTIVIM_VERSION = "multicloud-" + OPENSTACK_VERSION
+
 if 'test' in sys.argv:
     from ocata.pub.config import config
 
diff --git a/ocata/run.sh b/ocata/run.sh
index cfb52b74..680290a2 100644
--- a/ocata/run.sh
+++ b/ocata/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" lib/newton/newt
 sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" lib/newton/newton/pub/config/config.py
 
 memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
-export PYTHONPATH=lib/newton
+export PYTHONPATH=lib/newton:lib/share
 nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
 
 while [ ! -f logs/runtime_ocata.log ]; do
diff --git a/ocata/tox.ini b/ocata/tox.ini
index dcd7033e..391f3b71 100644
--- a/ocata/tox.ini
+++ b/ocata/tox.ini
@@ -7,7 +7,7 @@ downloadcache = ~/cache/pip
 
 [testenv]
 setenv =
-    PYTHONPATH = {toxinidir}/../newton
+    PYTHONPATH = {toxinidir}/../newton:{toxinidir}/../share
 deps = -r{toxinidir}/requirements.txt
 commands = 
     coverage run --branch manage.py test
-- 
cgit 1.2.3-korg