summaryrefslogtreecommitdiffstats
path: root/multivimbroker
diff options
context:
space:
mode:
authorDave Chen <wei.d.chen@intel.com>2017-08-11 13:17:34 +0800
committerEthan Lynn <ethanlynnl@vmware.com>2017-08-28 13:34:51 +0800
commitcbc888fc41403f08f33061b285049b530785ef73 (patch)
tree6af6797bdee419f8892c0c27c9b16d922fb1801c /multivimbroker
parent7597d573b048278759c4bf00e52c4e3ff9530e4f (diff)
update the namespace for multicloud/framework
Change-Id: I5c4036fbdb6a74ebc9484898fe91ef17670801c3 Issue-ID: MULTICLOUD-46 Signed-off-by: Dave Chen <wei.d.chen@intel.com>
Diffstat (limited to 'multivimbroker')
-rw-r--r--multivimbroker/multivimbroker/forwarder/urls.py8
-rw-r--r--multivimbroker/multivimbroker/pub/config/config.py6
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.host.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.image.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.limit.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.network.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.server.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json2
-rw-r--r--multivimbroker/multivimbroker/swagger/tests.py2
-rw-r--r--multivimbroker/multivimbroker/swagger/urls.py2
-rw-r--r--multivimbroker/pom.xml8
15 files changed, 22 insertions, 24 deletions
diff --git a/multivimbroker/multivimbroker/forwarder/urls.py b/multivimbroker/multivimbroker/forwarder/urls.py
index be20280..b63c4af 100644
--- a/multivimbroker/multivimbroker/forwarder/urls.py
+++ b/multivimbroker/multivimbroker/forwarder/urls.py
@@ -20,11 +20,9 @@ from multivimbroker.forwarder.views import Identity
urlpatterns = [
-
- url(r'^openoapi/multivim/v1/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3$',Identity.as_view()),
- url(r'^openoapi/multivim/v1/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3/auth/tokens$',Identity.as_view()),
- url(r'^openoapi/multivim/v1/(?P<vimid>[0-9a-zA-Z_-]+)', Forward.as_view()),
-
+ url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3$',Identity.as_view()),
+ url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)/identity/v3/auth/tokens$',Identity.as_view()),
+ url(r'^api/multicloud/v0/(?P<vimid>[0-9a-zA-Z_-]+)', Forward.as_view()),
]
urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/multivimbroker/multivimbroker/pub/config/config.py b/multivimbroker/multivimbroker/pub/config/config.py
index a15fae1..5f340ea 100644
--- a/multivimbroker/multivimbroker/pub/config/config.py
+++ b/multivimbroker/multivimbroker/pub/config/config.py
@@ -16,7 +16,7 @@ MSB_SERVICE_IP = '127.0.0.1'
MSB_SERVICE_PORT = '10080'
# [ESR]
-ESR_GET_VIM_URI = "/openoapi/extsys/v1/vims"
+ESR_GET_VIM_URI = "/api/extsys/v1/vims"
# [IMAGE LOCAL PATH]
ROOT_PATH = os.path.dirname(
@@ -36,11 +36,11 @@ DB_PASSWD = "password"
# [register]
REG_TO_MSB_WHEN_START = True
-REG_TO_MSB_REG_URL = "/openoapi/microservices/v1/services"
+REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
REG_TO_MSB_REG_PARAM = {
"serviceName": "multivim",
"version": "v1",
- "url": "/openoapi/multivim/v1",
+ "url": "/api/multicloud/v0",
"protocol": "REST",
"visualRange": "1",
"nodes": [{
diff --git a/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
index 2053e03..8d5a95f 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.flavor.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
index e04b526..2f7d653 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.host.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
index dcbba06..fcb970b 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.image.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.limit.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.limit.swagger.json
index 4665af4..420fc50 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.limit.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.limit.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
index 92794d6..dd8ce44 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.network.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
index 14b1d0e..f54b481 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.server.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
index 301c0fc..545a207 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.subnet.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
index 0f71874..d1f9176 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.tenant.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
index fda7597..091d6a5 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.volume.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json b/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
index 5a70dfb..3d1d18c 100644
--- a/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
+++ b/multivimbroker/multivimbroker/swagger/multivim.vport.swagger.json
@@ -4,7 +4,7 @@
"version": "1.0.0",
"title": "MultiVIM Service rest API"
},
- "basePath": "/openoapi/multivim/v1/",
+ "basePath": "/api/multicloud/v0/",
"tags": [
{
"name": "MultiVIM services"
diff --git a/multivimbroker/multivimbroker/swagger/tests.py b/multivimbroker/multivimbroker/swagger/tests.py
index d5b09fe..f8147ec 100644
--- a/multivimbroker/multivimbroker/swagger/tests.py
+++ b/multivimbroker/multivimbroker/swagger/tests.py
@@ -23,7 +23,7 @@ class SampleViewTest(unittest.TestCase):
pass
def test_sample(self):
- response = self.client.get("/openoapi/multivim/v1/swagger.json")
+ response = self.client.get("/api/multicloud/v0/swagger.json")
self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
# resp_data = json.loads(response.content)
# self.assertEqual({"status": "active"}, resp_data)
diff --git a/multivimbroker/multivimbroker/swagger/urls.py b/multivimbroker/multivimbroker/swagger/urls.py
index 1255ae7..d1af883 100644
--- a/multivimbroker/multivimbroker/swagger/urls.py
+++ b/multivimbroker/multivimbroker/swagger/urls.py
@@ -16,7 +16,7 @@ from multivimbroker.swagger import views
from multivimbroker.swagger.views import SwaggerJsonView
urlpatterns = [
- url(r'^openoapi/multivim/v1/swagger.json$', SwaggerJsonView.as_view()),
+ url(r'^api/multicloud/v0/swagger.json$', SwaggerJsonView.as_view()),
]
urlpatterns = format_suffix_patterns(urlpatterns)
diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index f6d0801..57a49fc 100644
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -19,11 +19,11 @@
<relativePath>../oparent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.multivimdriver.broker</groupId>
- <artifactId>multivimbroker</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.onap.multicloud.framework</groupId>
+ <artifactId>multicloud-framework</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>multivim/multivimbroker</name>
+ <name>multicloud/framework</name>
<description>multivim broker</description>
<build>
<plugins>