Merge "Add swagger for server action api"

diff --git a/INFO.yaml b/INFO.yaml
new file mode 100644 (file)
index 0000000..9d2d635
--- /dev/null
+++ b/INFO.yaml
@@ -0,0 +1,93 @@
+---
+project: 'multicloud-framework'
+project_creation_date: '2017-02-21'
+project_category: ''
+lifecycle_state: 'Incubation'
+project_lead: &onap_multicloud_ptl
+    name: 'Bin Yang'
+    email: 'bin.yang@windriver.com'
+    company: 'Windriver'
+    id: 'biny993'
+    timezone: 'China/Beijing'
+primary_contact: *onap_multicloud_ptl
+issue_tracking:
+    type: 'jira'
+    url: 'https://jira.onap.org/projects/MULTICLOUD'
+    key: 'MULTICLOUD'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
+meetings:
+    - type: 'zoom'
+        agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499'
+        url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6591499'
+        server: 'n/a'
+        channel: 'n/a'
+        repeats: 'weekly'
+        time: '13:00 UTC'
+repositories:
+    - 'multicloud-framework'
+    - 'multicloud-openstack'
+    - 'multicloud-openstack-vmware'
+    - 'multicloud-openstack-windriver'
+    - 'multicloud-azure'
+    - 'multicloud-k8s'
+committers:
+    - <<: *onap_multicloud_ptl
+    - name: 'Anbing Zhang'
+        email: 'zhanganbing@chinamobile.com'
+        company: 'China Mobile'
+        id: 'zhangab'
+        timezone: ''
+    - name: 'Xinhui Li'
+        email: 'lxinhui@vmware.com'
+        id: 'xinhuili'
+        company: 'VMware'
+        timezone: 'China/Beijing'
+    - name: 'Bin Hu'
+        email: 'bh526r@att.com'
+        company: 'ATT'
+        id: 'bh526r'
+        timezone: 'America/Palo Alto'
+    - name: 'Liang Ke'
+        email: 'lokyse@163.com'
+        company: 'VMWare'
+        id: 'liangke'
+        timezone: 'China/Beijing'
+    - name: 'yun huang'
+        email: 'yun.huang@windriver.com'
+        company: 'Windriver'
+        id: 'cloudhuang'
+        timezone: ''
+    - name: 'Victor Morales'
+        email: 'victor.morales@intel.com'
+        company: 'Intel'
+        id: 'electrocucaracha'
+        timezone: ''
+    - name: 'Ethan Lynn'
+        email: 'ethanlynnl@vmware.com'
+        company: 'VMWare'
+        id: 'ethanlynnl'
+        timezone: ''
+    - name: 'Huang Haibin'
+        email: 'haibin.huang@intel.com'
+        company: 'Intel'
+        id: 'haibin'
+        timezone: ''
+    - name: 'Sudhakar Reddy'
+        email: 'Sudhakar.Reddy@amdocs.com'
+        company: 'Amdocs'
+        id: 'SudhakarReddy'
+        timezone: ''
+tsc:
+    approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Addition'
+          name: 'yun huang'
+          name: 'Victor Morales'
+          name: 'Ethan Lynn'
+          name: 'Huang Haibin'
+          name: 'Sudhakar Reddy'
+          link: 'http://ircbot.wl.linuxfoundation.org/meetings/onap-meeting/2018/onap-meeting.2018-08-16-13.45.html'

diff --git a/multivimbroker/multivimbroker/forwarder/urls.py b/multivimbroker/multivimbroker/forwarder/urls.py
index 5e1320e..b14333f 100644 (file)
--- a/multivimbroker/multivimbroker/forwarder/urls.py
+++ b/multivimbroker/multivimbroker/forwarder/urls.py
@@ -16,6 +16,7 @@
 from django.conf.urls import url
 from rest_framework.urlpatterns import format_suffix_patterns
 
+# API v0
 from multivimbroker.forwarder.views import CheckCapacity
 from multivimbroker.forwarder.views import Extension
 from multivimbroker.forwarder.views import Forward
@@ -34,8 +35,10 @@ from multivimbroker.forwarder.views import APIv1Registry
 from multivimbroker.forwarder.views import APIv1UnRegistry
 from multivimbroker.forwarder.views import APIv1VIMTypes
 from multivimbroker.forwarder.views import APIv1MultiPartView
+from multivimbroker.forwarder.views import APIv1InfraWorkload
 
 urlpatterns = [
+    # API v0
     url(r'^api/multicloud/v0/vim_types$',
         VIMTypes.as_view()),
     url(r'^api/multicloud/v0/check_vim_capacity$',
@@ -69,7 +72,7 @@ urlpatterns = [
     url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
         r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry$',
         APIv1Registry.as_view()),
-    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)i'
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
         r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)$',
         APIv1UnRegistry.as_view()),
     url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
@@ -81,6 +84,9 @@ urlpatterns = [
     url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
         r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)',
         APIv1Forward.as_view()),
+    url(r'^api/multicloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)'
+        r'/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/infra_workload',
+        APIv1InfraWorkload.as_view()),
 ]
 
 urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/multivimbroker/multivimbroker/forwarder/views.py b/multivimbroker/multivimbroker/forwarder/views.py
index ef7ab95..264692e 100644 (file)
--- a/multivimbroker/multivimbroker/forwarder/views.py
+++ b/multivimbroker/multivimbroker/forwarder/views.py
@@ -307,3 +307,21 @@ class APIv1MultiPartView(MultiPartView):
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1MultiPartView, self).post(request, vimid)
+
+
+class APIv1InfraWorkload(BaseServer):
+
+    def post(self, request, cloud_owner, cloud_region_id):
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return self.send(vimid, request.get_full_path(), request.body, "POST",
+                         headers=originHeaders(request))
+
+    def get(self, request, cloud_owner, cloud_region_id):
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return self.send(vimid, request.get_full_path(), request.body, "GET",
+                         headers=originHeaders(request))
+
+    def delete(self, request, cloud_owner, cloud_region_id):
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return self.send(vimid, request.get_full_path(), request.body,
+                         "DELETE", headers=originHeaders(request))