diff options
author | vrvarma <vv8305@att.com> | 2019-12-13 10:24:55 -0500 |
---|---|---|
committer | vrvarma <vv8305@att.com> | 2019-12-13 10:29:45 -0500 |
commit | 430153e1a9489a86cf0ff7942eceb0bf5f1c170c (patch) | |
tree | b22090b80d11761a24d9cbeaa6348704cce2de83 /osdf/models | |
parent | 34ba229b31758c38a299a163de0007848b5921be (diff) |
osdf rearchitecture into apps and libs
Change-Id: I2db2f8e252bd5e60807b2ffabf5a5b193a789f7a
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-637
Diffstat (limited to 'osdf/models')
-rw-r--r-- | osdf/models/api/pciOptimizationRequest.py | 54 | ||||
-rw-r--r-- | osdf/models/api/pciOptimizationResponse.py | 46 | ||||
-rw-r--r-- | osdf/models/api/placementRequest.py | 105 | ||||
-rw-r--r-- | osdf/models/api/placementResponse.py | 64 |
4 files changed, 0 insertions, 269 deletions
diff --git a/osdf/models/api/pciOptimizationRequest.py b/osdf/models/api/pciOptimizationRequest.py deleted file mode 100644 index f5ec6b7..0000000 --- a/osdf/models/api/pciOptimizationRequest.py +++ /dev/null @@ -1,54 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -from schematics.types import BaseType, StringType, URLType, IntType -from schematics.types.compound import ModelType, ListType, DictType - -from .common import OSDFModel - - -class RequestInfo(OSDFModel): - """Info for northbound request from client such as SO""" - transactionId = StringType(required=True) - requestId = StringType(required=True) - callbackUrl = URLType(required=True) - callbackHeader = DictType(BaseType) - sourceId = StringType(required=True) - requestType = StringType(required=True) - numSolutions = IntType() - optimizers = ListType(StringType(required=True)) - timeout = IntType() - - -class ANRInfo(OSDFModel): - cellId = StringType(required=True) - removeableNeighbors = ListType(StringType()) - - -class CellInfo(OSDFModel): - """Information specific to CellInfo """ - networkId = StringType(required=True) - cellIdList = ListType(StringType(required=True)) - anrInputList = ListType(ModelType(ANRInfo)) - trigger = StringType() - - -class PCIOptimizationAPI(OSDFModel): - """Request for PCI optimization """ - requestInfo = ModelType(RequestInfo, required=True) - cellInfo = ModelType(CellInfo, required=True) diff --git a/osdf/models/api/pciOptimizationResponse.py b/osdf/models/api/pciOptimizationResponse.py deleted file mode 100644 index 71d0986..0000000 --- a/osdf/models/api/pciOptimizationResponse.py +++ /dev/null @@ -1,46 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -from schematics.types import StringType, IntType -from schematics.types.compound import ModelType, ListType - -from .common import OSDFModel - - -class PCISolution(OSDFModel): - cellId = StringType(required=True) - pci = IntType(required=True) - - -class ANRSolution(OSDFModel): - cellId = StringType(required=True) - removeableNeighbors = ListType(StringType()) - - -class Solution(OSDFModel): - networkId = StringType(required=True) - pciSolutions = ListType(ListType(ModelType(PCISolution), min_size=1)) - anrSolutions = ListType(ListType(ModelType(ANRSolution), min_size=1)) - - -class PCIOptimizationResponse(OSDFModel): - transactionId = StringType(required=True) - requestId = StringType(required=True) - requestStatus = StringType(required=True) - statusMessage = StringType() - solutions = ModelType(Solution, required=True) diff --git a/osdf/models/api/placementRequest.py b/osdf/models/api/placementRequest.py deleted file mode 100644 index a10ddc3..0000000 --- a/osdf/models/api/placementRequest.py +++ /dev/null @@ -1,105 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -from .common import OSDFModel -from schematics.types import BaseType, StringType, URLType, IntType, BooleanType -from schematics.types.compound import ModelType, ListType, DictType - - -class RequestInfo(OSDFModel): - """Info for northbound request from client such as SO""" - transactionId = StringType(required=True) - requestId = StringType(required=True) - callbackUrl = URLType(required=True) - callbackHeader = DictType(BaseType) - sourceId = StringType(required=True) - requestType = StringType(required=True) - numSolutions = IntType() - optimizers = ListType(StringType(required=True)) - timeout = IntType() - - -class Candidates(OSDFModel): - """Preferred candidate for a resource (sent as part of a request from client)""" - identifierType = StringType(required=True) - identifiers = ListType(StringType(required=True)) - cloudOwner = StringType() - - -class ModelMetaData(OSDFModel): - """Model information for a specific resource""" - modelInvariantId = StringType(required=True) - modelVersionId = StringType(required=True) - modelName = StringType() - modelType = StringType() - modelVersion = StringType() - modelCustomizationName = StringType() - - -class LicenseModel(OSDFModel): - entitlementPoolUUID = ListType(StringType(required=True)) - licenseKeyGroupUUID = ListType(StringType(required=True)) - - -class LicenseDemands(OSDFModel): - resourceModuleName = StringType(required=True) - serviceResourceId = StringType(required=True) - resourceModelInfo = ModelType(ModelMetaData, required=True) - existingLicenses = ModelType(LicenseModel) - - -class LicenseInfo(OSDFModel): - licenseDemands = ListType(ModelType(LicenseDemands)) - - -class PlacementDemand(OSDFModel): - resourceModuleName = StringType(required=True) - serviceResourceId = StringType(required=True) - tenantId = StringType() - resourceModelInfo = ModelType(ModelMetaData, required=True) - existingCandidates = ListType(ModelType(Candidates)) - excludedCandidates = ListType(ModelType(Candidates)) - requiredCandidates = ListType(ModelType(Candidates)) - - -class ServiceInfo(OSDFModel): - serviceInstanceId = StringType(required=True) - modelInfo = ModelType(ModelMetaData, required=True) - serviceName = StringType(required=True) - - -class SubscriberInfo(OSDFModel): - """Details on the customer that subscribes to the VNFs""" - globalSubscriberId = StringType(required=True) - subscriberName = StringType() - subscriberCommonSiteId = StringType() - - -class PlacementInfo(OSDFModel): - """Information specific to placement optimization""" - requestParameters = DictType(BaseType) - placementDemands = ListType(ModelType(PlacementDemand), min_size=1) - subscriberInfo = ModelType(SubscriberInfo) - - -class PlacementAPI(OSDFModel): - """Request for placement optimization (specific to optimization and additional metadata""" - requestInfo = ModelType(RequestInfo, required=True) - placementInfo = ModelType(PlacementInfo, required=True) - licenseInfo = ModelType(LicenseInfo) - serviceInfo = ModelType(ServiceInfo, required=True) diff --git a/osdf/models/api/placementResponse.py b/osdf/models/api/placementResponse.py deleted file mode 100644 index 063a9a8..0000000 --- a/osdf/models/api/placementResponse.py +++ /dev/null @@ -1,64 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -from .common import OSDFModel -from schematics.types import BaseType, StringType -from schematics.types.compound import ModelType, ListType, DictType - - -# TODO: update osdf.models - -class LicenseSolution(OSDFModel): - serviceResourceId = StringType(required=True) - resourceModuleName = StringType(required=True) - entitlementPoolUUID = ListType(StringType(required=True)) - licenseKeyGroupUUID = ListType(StringType(required=True)) - entitlementPoolInvariantUUID = ListType(StringType(required=True)) - licenseKeyGroupInvariantUUID = ListType(StringType(required=True)) - - -class Candidates(OSDFModel): - """Preferred candidate for a resource (sent as part of a request from client)""" - identifierType = StringType(required=True) - identifiers = ListType(StringType(required=True)) - cloudOwner = StringType() - - -class AssignmentInfo(OSDFModel): - key = StringType(required=True) - value = BaseType(required=True) - - -class PlacementSolution(OSDFModel): - serviceResourceId = StringType(required=True) - resourceModuleName = StringType(required=True) - solution = ModelType(Candidates, required=True) - assignmentInfo = ListType(ModelType(AssignmentInfo)) - - -class Solution(OSDFModel): - placementSolutions = ListType(ListType(ModelType(PlacementSolution), min_size=1)) - licenseSolutions = ListType(ModelType(LicenseSolution), min_size=1) - - -class PlacementResponse(OSDFModel): - transactionId = StringType(required=True) - requestId = StringType(required=True) - requestStatus = StringType(required=True) - statusMessage = StringType() - solutions = ModelType(Solution, required=True) |