From 21d45dd15cebc520db55216cf2c6b00df7222767 Mon Sep 17 00:00:00 2001 From: xinhuili Date: Mon, 27 Mar 2017 00:55:11 -0700 Subject: Merge several fixes This patch is to merge several fixes. Change-Id: If85e425aa386be268653d918d09a671c8947cd62 Issue-ids: MULTIVIM-36 Signed-off-by: xinhuili --- vio/vio/pub/vim/vimapi/network/OperateNetwork.py | 2 +- vio/vio/swagger/views/multivim.volume.swagger.json | 4 ++-- vio/vio/swagger/views/volume/views.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py index 325999b..7090f81 100644 --- a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py +++ b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py @@ -77,7 +77,7 @@ class OperateNetwork(BaseNet): result['segmentationId'] = network.provider_segmentation_id result['networkType'] = network.provider_network_type result['physicalNetwork'] = network.provider_physical_network - result['vlanTransparent'] = True + result['vlanTransparent'] = False result['shared'] = network.is_shared result['routerExternal'] = network.is_router_external return result diff --git a/vio/vio/swagger/views/multivim.volume.swagger.json b/vio/vio/swagger/views/multivim.volume.swagger.json index 6609c90..87051a4 100644 --- a/vio/vio/swagger/views/multivim.volume.swagger.json +++ b/vio/vio/swagger/views/multivim.volume.swagger.json @@ -249,9 +249,9 @@ "type": "integer", "description": "volume size" }, - "imageName": { + "imageId": { "type": "string", - "description": "image name to create volume" + "description": "image UUID to create volume" }, "volumeType": { "type": "string", diff --git a/vio/vio/swagger/views/volume/views.py b/vio/vio/swagger/views/volume/views.py index d80d6ac..0c38d5a 100644 --- a/vio/vio/swagger/views/volume/views.py +++ b/vio/vio/swagger/views/volume/views.py @@ -127,9 +127,9 @@ class CreateListVolumeView(APIView): rsp.update(vim_rsp) return Response(data=rsp, status=status.HTTP_200_OK) - if body.get('imageName'): + if body.get('imageId'): image_op = OperateImage.OperateImage(vim_info) - imageName = body.get('imageName') + imageName = body.get('imageId') image = image_op.find_vim_image(imageName) body['imageId'] = image.id -- cgit 1.2.3-korg