aboutsummaryrefslogtreecommitdiffstats
path: root/osdf/models
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2019-10-20 21:36:37 +0200
committerLukasz Rajewski <lukasz.rajewski@orange.com>2019-10-21 08:53:22 +0200
commitd83fbd6ad8bbd2d0d3184f0df9f6cfa8cc4b96be (patch)
tree4b55be4b04374f681ac6655e92dbcd189e54fbc4 /osdf/models
parenta08923546e09dc830100f32743667c0f48287f7e (diff)
Unique field moved to vnf policy
Unique req field was moved from OSDF request to VNF policy -> content -> vnfProperties Change-Id: I96b8a2bb881370cdb8d86b52ad4798e24e98425d Issue-ID: OPTFRA-482 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Diffstat (limited to 'osdf/models')
-rw-r--r--osdf/models/api/placementRequest.py1
-rw-r--r--osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml3
-rw-r--r--osdf/models/policy/placement/tosca_upload/onap.policies.optimization.VnfPolicy.yaml3
3 files changed, 6 insertions, 1 deletions
diff --git a/osdf/models/api/placementRequest.py b/osdf/models/api/placementRequest.py
index 7d6bde4..a10ddc3 100644
--- a/osdf/models/api/placementRequest.py
+++ b/osdf/models/api/placementRequest.py
@@ -71,7 +71,6 @@ class PlacementDemand(OSDFModel):
resourceModuleName = StringType(required=True)
serviceResourceId = StringType(required=True)
tenantId = StringType()
- unique = BooleanType() # to be implemented on the policy level
resourceModelInfo = ModelType(ModelMetaData, required=True)
existingCandidates = ListType(ModelType(Candidates))
excludedCandidates = ListType(ModelType(Candidates))
diff --git a/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml
index 4ce3b9f..46d8c32 100644
--- a/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml
+++ b/osdf/models/policy/placement/tosca/vnfPolicy-v20181031.yml
@@ -66,3 +66,6 @@ data_types:
customerId:
type: string
required: true
+ unique:
+ type: string
+ required: false
diff --git a/osdf/models/policy/placement/tosca_upload/onap.policies.optimization.VnfPolicy.yaml b/osdf/models/policy/placement/tosca_upload/onap.policies.optimization.VnfPolicy.yaml
index 13d4f13..e1ec36d 100644
--- a/osdf/models/policy/placement/tosca_upload/onap.policies.optimization.VnfPolicy.yaml
+++ b/osdf/models/policy/placement/tosca_upload/onap.policies.optimization.VnfPolicy.yaml
@@ -70,4 +70,7 @@ data_types:
customerId:
type: string
required: true
+ unique:
+ type: string
+ required: false