aboutsummaryrefslogtreecommitdiffstats
path: root/osdf/models
diff options
context:
space:
mode:
authorShankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com>2019-11-19 15:04:35 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-19 15:04:35 +0000
commit34ba229b31758c38a299a163de0007848b5921be (patch)
tree98713f880c0273d337548b0c24161568d6afd9af /osdf/models
parent5293a382b6463069d4a2cc87806426d74833aa2e (diff)
parentd83fbd6ad8bbd2d0d3184f0df9f6cfa8cc4b96be (diff)
Merge "Unique field moved to vnf policy"
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