Fixed tosca models, updated code and policies

Fixed tosca models, updated policies and code
for conductor payload changes for vFW and vCPE

Change-Id: Ia98c632fc2fd564efa3b96e8a7888bc97d1c5448
Issue-ID: OPTFRA-384
Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>

1 files changed, 0 insertions, 43 deletions

diff --git a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml
deleted file mode 100644
index 2488769..0000000
--- a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types:
-    policy.nodes.queryPolicy:
-        derived_from: policy.nodes.Root
-        properties:
-            policyScope:
-                type: list
-                description: scope where the policy is applicable
-                required: true
-                matchable: true
-                entry_schema:
-                    type: string
-            policyType:
-                type: list
-                description: type of a policy
-                required: true
-                matchable: true
-                entry_schema:
-                    type: string
-                    consraints:
-                    -   valid_values:
-                        - queryPolicy
-            identity:
-                type: string
-                required: true
-            queryProperties:
-                type: list
-                required: true
-                entry_schema:
-                -   type: policy.data.queryProperties_properties
-data_types:
-    policy.data.queryProperties_properties:
-        derived_from: tosca.nodes.Root
-        properties:
-            attribute:
-                type: string
-                required: true
-            value:
-                type: string
-                required: true
-            attribute_location:
-                type: string
-                required: true