diff options
author | Bin Yang <bin.yang@windriver.com> | 2018-08-15 06:11:24 +0000 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2018-08-15 06:11:24 +0000 |
commit | 400e1b7c35a1db4cdcf20f4453631bc0888a330f (patch) | |
tree | 49d1c5355fb2072f8be9975fa83ae93ae5d7dc60 /share/newton_base/openoapi/network.py | |
parent | 8eacf7b7496a7864313595dcf3780d83b423c338 (diff) |
API upgrading for OPENOAPI
Change-Id: I8d0fdc7671d9333ee24e77dda9e07c32a0767950
Issue-ID: MULTICLOUD-297
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'share/newton_base/openoapi/network.py')
-rw-r--r-- | share/newton_base/openoapi/network.py | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/share/newton_base/openoapi/network.py b/share/newton_base/openoapi/network.py index b780ab42..9ad7a83f 100644 --- a/share/newton_base/openoapi/network.py +++ b/share/newton_base/openoapi/network.py @@ -22,6 +22,7 @@ from rest_framework.views import APIView from common.exceptions import VimDriverNewtonException from newton_base.util import VimDriverUtils +from common.msapi import extsys logger = logging.getLogger(__name__) @@ -45,7 +46,7 @@ class Networks(APIView): pass try: query = VimDriverUtils.get_query_part(request) - content, status_code = self.get_networks(query, vimid, tenantid, networkid) + content, status_code = self._get_networks(query, vimid, tenantid, networkid) logger.info("response with status = %s" % status_code) return Response(data=content, status=status_code) @@ -60,7 +61,7 @@ class Networks(APIView): return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - def get_networks(self, query, vimid="", tenantid="", networkid=""): + def _get_networks(self, query, vimid="", tenantid="", networkid=""): # prepare request resource to vim instance req_resouce = "v2.0/networks" @@ -82,6 +83,8 @@ class Networks(APIView): vim_dict = { "vimName": vim["name"], "vimId": vim["vimId"], + "cloud-owner": vim["cloud_owner"], + "cloud-region-id": vim["cloud_region_id"], "tenantId": tenantid, } content.update(vim_dict) @@ -108,7 +111,7 @@ class Networks(APIView): try: #check if created already: check name query = "name=%s" % request.data["name"] - content, status_code = self.get_networks(query, vimid, tenantid) + content, status_code = self._get_networks(query, vimid, tenantid) existed = False if status_code == 200: for network in content["networks"]: @@ -143,6 +146,8 @@ class Networks(APIView): vim_dict = { "vimName": vim["name"], "vimId": vim["vimId"], + "cloud-owner": vim["cloud_owner"], + "cloud-region-id": vim["cloud_region_id"], "tenantId": tenantid, "returnCode": 1, } @@ -190,5 +195,23 @@ class Networks(APIView): status=status.HTTP_500_INTERNAL_SERVER_ERROR) -class Subnets(APIView): - pass + +class APIv1Networks(Networks): + + def get(self, request, cloud_owner="", cloud_region_id="", tenantid="", networkid=""): + self._logger.info("%s, %s" % (cloud_owner, cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Networks, self).get(request, vimid, tenantid, networkid) + + def post(self, request, cloud_owner="", cloud_region_id="", tenantid="", networkid=""): + self._logger.info("%s, %s" % (cloud_owner, cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Networks, self).post(request, vimid, tenantid, networkid) + + def delete(self, request, cloud_owner="", cloud_region_id="", tenantid="", networkid=""): + self._logger.info("%s, %s" % (cloud_owner, cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Networks, self).delete(request, vimid, tenantid, networkid) |