From 2c2c8a476cafa06b85407a7db4b431aeb5514b2f Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Tue, 3 May 2022 11:32:21 +0200
Subject: [PATCH] Compute: - fixed bug with slice retrieval - code cleanup
---
.../rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
index 440b706ab..27489410f 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Service.py
@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from ctypes import Union
import logging
from flask import request
from flask.json import jsonify
@@ -20,7 +19,7 @@ from flask_restful import Resource
from common.Constants import DEFAULT_CONTEXT_UUID
from common.Settings import get_setting
from context.client.ContextClient import ContextClient
-from context.proto.context_pb2 import Service, ServiceId, Slice, SliceStatusEnum
+from context.proto.context_pb2 import ServiceId, SliceStatusEnum
from service.client.ServiceClient import ServiceClient
from service.proto.context_pb2 import ServiceStatusEnum
from .tools.Authentication import HTTP_AUTH
@@ -50,16 +49,16 @@ class L2VPN_Service(Resource):
if target.service_id.service_uuid.uuid != vpn_id: # pylint: disable=no-member
raise Exception('Service retrieval failed. Wrong Service Id was returned')
service_ready_status = ServiceStatusEnum.SERVICESTATUS_ACTIVE
- service_status = target.service_status.service_status
+ service_status = target.service_status.service_status # pylint: disable=no-member
response.status_code = HTTP_OK if service_status == service_ready_status else HTTP_GATEWAYTIMEOUT
return response
target = get_slice(self.context_client, vpn_id)
- if target is None:
+ if target is not None:
if target.slice_id.slice_uuid.uuid != vpn_id: # pylint: disable=no-member
raise Exception('Slice retrieval failed. Wrong Slice Id was returned')
slice_ready_status = SliceStatusEnum.SLICESTATUS_ACTIVE
- slice_status = target.slice_status.slice_status
+ slice_status = target.slice_status.slice_status # pylint: disable=no-member
response.status_code = HTTP_OK if slice_status == slice_ready_status else HTTP_GATEWAYTIMEOUT
return response
--
GitLab