summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitreview4
-rw-r--r--pom.xml8
-rw-r--r--vio/pom.xml15
-rw-r--r--vio/vio/pub/config/config.py6
-rw-r--r--vio/vio/swagger/multivim.flavor.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.host.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.image.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.limit.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.network.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.server.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.subnet.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.tenant.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.volume.swagger.json2
-rw-r--r--vio/vio/swagger/multivim.vport.swagger.json2
-rw-r--r--vio/vio/swagger/tests.py2
-rw-r--r--vio/vio/swagger/urls.py60
-rw-r--r--vio/vio/swagger/views.py2
-rw-r--r--vio/vio/swagger/views/multivim.flavor.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.host.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.image.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.limit.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.network.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.server.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.subnet.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.tenant.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.volume.swagger.json2
-rw-r--r--vio/vio/swagger/views/multivim.vport.swagger.json2
-rw-r--r--vio/vio/swagger/views/proxyplugin/identity/views.py8
-rw-r--r--vio/vio/swagger/views/swagger_json.py2
29 files changed, 76 insertions, 71 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..c0dacf9
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=multicloud/openstack/vmware.git
diff --git a/pom.xml b/pom.xml
index a863987..6770969 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.multivimdriver.vmware.vio</groupId>
- <artifactId>multivimdriver-vmware-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <name>multivim-vio</name>
+ <groupId>org.onap.multicloud.openstack.vmware</groupId>
+ <artifactId>multicloud-vio</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>multicloud/openstack/vmware</name>
<packaging>pom</packaging>
<modules>
diff --git a/vio/pom.xml b/vio/pom.xml
index 229f5f9..a3bda08 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -14,17 +14,18 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.openo.multivimdriver.vmware.vio</groupId>
- <artifactId>multivimdriver-vmware-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>oparent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../oparent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.multivimdriver.vmware.vio</groupId>
- <artifactId>multivimdriver-vio</artifactId>
+ <groupId>org.onap.multicloud.openstack.vmware</groupId>
+ <artifactId>multicloud-vio</artifactId>
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>multivimdriver/vio</name>
- <description>multivimdriver for vio mitaka</description>
+ <name>multicloud/openstack/vmware</name>
+ <description>multiclouddriver for vio</description>
<build>
<plugins>
<plugin>
diff --git a/vio/vio/pub/config/config.py b/vio/vio/pub/config/config.py
index 5c57d2e..e00351b 100644
--- a/vio/vio/pub/config/config.py
+++ b/vio/vio/pub/config/config.py
@@ -33,11 +33,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-vio",
+ "serviceName": "multicloud-vio",
"version": "v1",
- "url": "/openoapi/multivim-vio/v1",
+ "url": "/api/multicloud-vio/v0",
"protocol": "REST",
"visualRange": "1",
"nodes": [{
diff --git a/vio/vio/swagger/multivim.flavor.swagger.json b/vio/vio/swagger/multivim.flavor.swagger.json
index 76c1d5d..c4519d5 100644
--- a/vio/vio/swagger/multivim.flavor.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.host.swagger.json b/vio/vio/swagger/multivim.host.swagger.json
index f5c8faf..af2d388 100644
--- a/vio/vio/swagger/multivim.host.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.image.swagger.json b/vio/vio/swagger/multivim.image.swagger.json
index 1f1e619..395e45a 100644
--- a/vio/vio/swagger/multivim.image.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.limit.swagger.json b/vio/vio/swagger/multivim.limit.swagger.json
index 08008cf..d8e5ed2 100644
--- a/vio/vio/swagger/multivim.limit.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.network.swagger.json b/vio/vio/swagger/multivim.network.swagger.json
index ee08d6b..8375a20 100644
--- a/vio/vio/swagger/multivim.network.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.server.swagger.json b/vio/vio/swagger/multivim.server.swagger.json
index a018ce0..bd37954 100644
--- a/vio/vio/swagger/multivim.server.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.subnet.swagger.json b/vio/vio/swagger/multivim.subnet.swagger.json
index 447f43b..4b887db 100644
--- a/vio/vio/swagger/multivim.subnet.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.tenant.swagger.json b/vio/vio/swagger/multivim.tenant.swagger.json
index c2c5187..8749170 100644
--- a/vio/vio/swagger/multivim.tenant.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.volume.swagger.json b/vio/vio/swagger/multivim.volume.swagger.json
index 5b89998..f5b1c20 100644
--- a/vio/vio/swagger/multivim.volume.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/multivim.vport.swagger.json b/vio/vio/swagger/multivim.vport.swagger.json
index bcf22ac..b841bbb 100644
--- a/vio/vio/swagger/multivim.vport.swagger.json
+++ b/vio/vio/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 VIO services"
diff --git a/vio/vio/swagger/tests.py b/vio/vio/swagger/tests.py
index 04b4236..a3f2c3b 100644
--- a/vio/vio/swagger/tests.py
+++ b/vio/vio/swagger/tests.py
@@ -24,7 +24,7 @@ class SampleViewTest(unittest.TestCase):
pass
def test_sample(self):
- response = self.client.get("/openoapi/multivim-vio/v1/swagger.json")
+ response = self.client.get("/api/multicloud-vio/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/vio/vio/swagger/urls.py b/vio/vio/swagger/urls.py
index 26a739f..7751e83 100644
--- a/vio/vio/swagger/urls.py
+++ b/vio/vio/swagger/urls.py
@@ -37,93 +37,93 @@ from vio.swagger.views.proxyplugin.volumn.views import VolumeServer
from vio.swagger.views.proxyplugin.heat.views import HeatServer
urlpatterns = [
- url(r'^openoapi/multivim-vio/v1/swagger.json$', SwaggerJsonView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/swagger.json$', SwaggerJsonView.as_view()),
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'tenants$', ListTenantsView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z_-]+)/images$',
CreateListImagesView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z_-]+)/images/(?P<imageid>[0-9a-zA-Z_-]+)$',
GetDeleteImageView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z_-]+)/volumes$',
CreateListVolumeView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z_-]+)/volumes/(?P<volumeid>[0-9a-zA-Z_-]+)$',
GetDeleteVolumeView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/servers$', ListServersView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/servers/(?P<serverid>[0-9a-zA-Z_-]+)$',
GetServerView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/flavors$',
FlavorsView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/flavors/(?P<flavorid>[0-9a-zA-Z_-]+)$',
FlavorView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/limits$',
LimitsView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/hosts$',
HostsView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z_-]+)/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z_-]+)/'
r'(?P<tenantid>[0-9a-zA-Z]+)/hosts/(?P<hostname>[0-9a-zA-Z_-]+)$',
HostView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks$',
CreateNetworkView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/networks/'
r'(?P<networkid>[0-9a-zA-Z\-\_]+)$',
DeleteNetworkView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets$',
CreateSubnetView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/subnets/'
r'(?P<subnetid>[0-9a-zA-Z\-\_]+)$',
DeleteSubnetView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports$',
CreatePortView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports/'
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-zA-Z\-\_]+)/(?P<tenantid>[0-9a-zA-Z\-\_]+)/ports/'
r'(?P<portid>[0-9a-zA-Z\-\_]+)$',
DeletePortView.as_view()),
# proxy
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity/v3',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity/v3',
TokenView.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity$',
IdentityServer.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/identity/(?P<other>(.*))$',
IdentityServer.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/glance/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/glance/(?P<other>(.*))$',
ImageServer.as_view()),
url(
- r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinder/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinder/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
url(
- r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinderv2/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinderv2/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
url(
- r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinderv3/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/cinderv3/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
VolumeServer.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/neutron$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/neutron$',
NetWorkServer.as_view()),
- url(r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/neutron/(?P<other>(.*))$',
+ url(r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/neutron/(?P<other>(.*))$',
NetWorkServer.as_view()),
url(
- r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/heat/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/heat/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
HeatServer.as_view()),
url(
- r'^openoapi/multivim-vio/v1/(?P<vimid>[0-9a-z-A-Z\-\_]+)/nova/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
+ r'^api/multicloud-vio/v0/(?P<vimid>[0-9a-z-A-Z\-\_]+)/nova/(?P<tenantid>[0-9a-z-A-Z\-\_]+)/(?P<other>(.*))$',
ComputeServer.as_view()),
]
diff --git a/vio/vio/swagger/views.py b/vio/vio/swagger/views.py
index eced70b..a41b995 100644
--- a/vio/vio/swagger/views.py
+++ b/vio/vio/swagger/views.py
@@ -84,7 +84,7 @@ class SwaggerJsonView(APIView):
f.close()
json_data["paths"].update(json_data_temp["paths"])
json_data["definitions"].update(json_data_temp["definitions"])
- json_data["basePath"] = "/openoapi/multivim-vio/v1/"
+ json_data["basePath"] = "/api/multicloud-vio/v0/"
json_data["info"]["title"] = "MultiVIM driver of OpenStack VIO Service NBI"
return Response(json_data)
diff --git a/vio/vio/swagger/views/multivim.flavor.swagger.json b/vio/vio/swagger/views/multivim.flavor.swagger.json
index ddc7045..33b6287 100644
--- a/vio/vio/swagger/views/multivim.flavor.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.host.swagger.json b/vio/vio/swagger/views/multivim.host.swagger.json
index ec797c0..6a7b5f1 100644
--- a/vio/vio/swagger/views/multivim.host.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.image.swagger.json b/vio/vio/swagger/views/multivim.image.swagger.json
index 05c99ed..bb30a89 100644
--- a/vio/vio/swagger/views/multivim.image.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.limit.swagger.json b/vio/vio/swagger/views/multivim.limit.swagger.json
index 08008cf..d8e5ed2 100644
--- a/vio/vio/swagger/views/multivim.limit.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.network.swagger.json b/vio/vio/swagger/views/multivim.network.swagger.json
index 6a76164..164bb19 100644
--- a/vio/vio/swagger/views/multivim.network.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.server.swagger.json b/vio/vio/swagger/views/multivim.server.swagger.json
index d598b48..fac4632 100644
--- a/vio/vio/swagger/views/multivim.server.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.subnet.swagger.json b/vio/vio/swagger/views/multivim.subnet.swagger.json
index 4c18b13..7a1cc82 100644
--- a/vio/vio/swagger/views/multivim.subnet.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.tenant.swagger.json b/vio/vio/swagger/views/multivim.tenant.swagger.json
index 75c2c40..8c9ec9c 100644
--- a/vio/vio/swagger/views/multivim.tenant.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.volume.swagger.json b/vio/vio/swagger/views/multivim.volume.swagger.json
index 87051a4..bc0a766 100644
--- a/vio/vio/swagger/views/multivim.volume.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/multivim.vport.swagger.json b/vio/vio/swagger/views/multivim.vport.swagger.json
index c621150..c23dca6 100644
--- a/vio/vio/swagger/views/multivim.vport.swagger.json
+++ b/vio/vio/swagger/views/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 VIO services"
diff --git a/vio/vio/swagger/views/proxyplugin/identity/views.py b/vio/vio/swagger/views/proxyplugin/identity/views.py
index c7addc9..6312541 100644
--- a/vio/vio/swagger/views/proxyplugin/identity/views.py
+++ b/vio/vio/swagger/views/proxyplugin/identity/views.py
@@ -90,7 +90,7 @@ class TokenView(BaseClient):
logger.info("vimid(%(vimid)s) get keystone url %(url)s ", {"vimid": vimid, "url": keystoneURL})
try:
res = requests.get(url=keystoneURL).json()
- res['version']['links'][0]['href']="http://"+MSB_ADDRESS+"/multivim-vio/v1/"+vimid +"/identity/v3"
+ res['version']['links'][0]['href']="http://"+MSB_ADDRESS+"/multicloud-vio/v0/"+vimid +"/identity/v3"
except Exception as e:
@@ -163,12 +163,12 @@ class TokenView(BaseClient):
res=tmp.split("/")
if i['type'] in ['image','network','cloudformation','identity']:
if i['type'] != 'identity':
- res[2] = MSB_ADDRESS+"/multivim-vio/v1/" + vimid + "/" + i['name']
+ res[2] = MSB_ADDRESS+"/multicloud-vio/v0/" + vimid + "/" + i['name']
else:
# use identity instead of keystone
- res[2] = MSB_ADDRESS + "/multivim-vio/v1/" + vimid + "/" + i['type']
+ res[2] = MSB_ADDRESS + "/multicloud-vio/v0/" + vimid + "/" + i['type']
else:
- res[2]= MSB_ADDRESS+"/multivim-vio/v1/"+vimid+"/"+i['name']+"/"+tenantid
+ res[2]= MSB_ADDRESS+"/multicloud-vio/v0/"+vimid+"/"+i['name']+"/"+tenantid
j['url']="http:"+"//"+res[2]
except Exception as e:
logging.exception("error %s" % e)
diff --git a/vio/vio/swagger/views/swagger_json.py b/vio/vio/swagger/views/swagger_json.py
index cf401b5..a660a21 100644
--- a/vio/vio/swagger/views/swagger_json.py
+++ b/vio/vio/swagger/views/swagger_json.py
@@ -82,6 +82,6 @@ class SwaggerJsonView(APIView):
f.close()
json_data["paths"].update(json_data_temp["paths"])
json_data["definitions"].update(json_data_temp["definitions"])
- json_data["basePath"] = "/openoapi/multivim-vio/v1/"
+ json_data["basePath"] = "/api/multicloud-vio/v0/"
json_data["info"]["title"] = "MultiVIM driver of OpenStack VIO Service NBI"
return Response(json_data)