From 01cd5da39097c948e4fba94eb785b60452c70af3 Mon Sep 17 00:00:00 2001 From: dhebeha Date: Fri, 14 Aug 2020 11:45:20 +0530 Subject: Change API layer for NSI selection Issue-ID: OPTFRA-802 Signed-off-by: dhebeha Change-Id: Ia7e36da8d9a4d1f3f8e8eb00a61e6b0b29fbbbf6 --- .../models/api/nsi_selection_request.py | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'apps/slice_selection/models/api/nsi_selection_request.py') diff --git a/apps/slice_selection/models/api/nsi_selection_request.py b/apps/slice_selection/models/api/nsi_selection_request.py index b7f3fbd..943fa56 100644 --- a/apps/slice_selection/models/api/nsi_selection_request.py +++ b/apps/slice_selection/models/api/nsi_selection_request.py @@ -26,29 +26,31 @@ class RequestInfo(OSDFModel): transactionId = StringType(required=True) requestId = StringType(required=True) callbackUrl = URLType(required=True) - callbackHeader = DictType(BaseType) sourceId = StringType(required=True) + callbackHeader = DictType(BaseType) timeout = IntType() + numSolutions = IntType() + addtnlArgs = DictType(BaseType) -class NSTInfo(OSDFModel): - """Preferred candidate for a resource (sent as part of a request from client)""" - modelInvariantId = StringType(required=True) - modelVersionId = StringType(required=True) - modelName = StringType() - modelType = StringType() - modelVersion = StringType() - modelCustomizationName = StringType() +class NxTInfo(OSDFModel): + """Information about NST/NSST model""" + invariantUUID = StringType(required=True) + UUID = StringType(required=True) + name = StringType(required=True) -class ServiceInfo(OSDFModel): - serviceInstanceId = StringType(required=True) - serviceName = StringType(required=True) +class SubnetCapability(OSDFModel): + """Subnet capability of every subnet""" + domainType = StringType(required=True) + capabilityDetails = DictType(BaseType, required=True) class NSISelectionAPI(OSDFModel): """Request for nsi selection (specific to optimization and additional metadata""" requestInfo = ModelType(RequestInfo, required=True) - NSTInfoList = ListType(ModelType(NSTInfo), required=True) - serviceInfo = ModelType(ServiceInfo, required=True) + NSTInfo = ModelType(NxTInfo, required=True) + NSSTInfo = ListType(ModelType(NxTInfo), required=True) serviceProfile = DictType(BaseType, required=True) + subnetCapabilities = ListType(ModelType(SubnetCapability), required=True) + preferReuse = BooleanType() -- cgit 1.2.3-korg