From c78fe38ca9a3684d8ccd94c6b3101a1dee474b5b Mon Sep 17 00:00:00 2001 From: sarada prasad sahoo Date: Thu, 11 Apr 2019 09:31:34 +0530 Subject: sdc-backend-init docker container exits unsuccessfully with 404 error in importNormativeAll.py import of osca.policies.nfv.AffinityRule and tosca.policies.nfv.AntiAffinityRule getting failed at first attempt, comment execute , then un-comment execute it is working, strange issue Change-Id: Ia8799b4221b771ed34d61d09f87e2d9973861ebe Issue-ID: SDC-2231 Signed-off-by: sarada prasad sahoo --- .../import/tosca/policy-types/policyTypes.json | 8 ---- .../import/tosca/policy-types/policyTypes.yml | 46 +++++++++++----------- 2 files changed, 23 insertions(+), 31 deletions(-) (limited to 'catalog-be/src/main/resources/import') diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json index 1809bba71c..c6315fc180 100644 --- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json +++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.json @@ -87,14 +87,6 @@ "displayName": "NFV VirtualLinkBitrate InitialDelta", "icon": "policy-nfv-vlbitrate-initialdelta" }, - "tosca.policies.nfv.AffinityRule": { - "displayName": "NFV AffinityRule", - "icon": "policy-nfv-affinityrule" - }, - "tosca.policies.nfv.AntiAffinityRule": { - "displayName": "NFV AntiAffinityRule", - "icon": "policy-nfv-anti-affinityrule" - }, "tosca.policies.nfv.SecurityGroupRule": { "displayName": "NFV SecurityGroupRule", "icon": "policy-nfv-securitygrouprule" diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml index 53fa5937ba..993c2a120d 100644 --- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml @@ -229,29 +229,29 @@ tosca.policies.nfv.VirtualLinkBitrateInitialDelta: required: true targets: [ tosca.nodes.nfv.VnfVirtualLink ] -tosca.policies.nfv.AffinityRule: - derived_from: tosca.policies.Placement - description: The AffinityRule describes the affinity rules applicable for the defined targets - properties: - scope: - type: string - description: scope of the rule is an NFVI_node, an NFVI_PoP, etc. - required: true - constraints: - - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ] - targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ] - -tosca.policies.nfv.AntiAffinityRule: - derived_from: tosca.policies.Placement - description: The AntiAffinityRule describes the anti-affinity rules applicable for the defined targets - properties: - scope: - type: string - description: scope of the rule is an NFVI_node, an NFVI_PoP, etc. - required: true - constraints: - - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ] - targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ] +# tosca.policies.nfv.AffinityRule: +# derived_from: tosca.policies.Placement +# description: The AffinityRule describes the affinity rules applicable for the defined targets +# properties: +# scope: +# type: string +# description: scope of the rule is an NFVI_node, an NFVI_PoP, etc. +# required: true +# constraints: +# - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ] +# targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ] +# +# tosca.policies.nfv.AntiAffinityRule: +# derived_from: tosca.policies.Placement +# description: The AntiAffinityRule describes the anti-affinity rules applicable for the defined targets +# properties: +# scope: +# type: string +# description: scope of the rule is an NFVI_node, an NFVI_PoP, etc. +# required: true +# constraints: +# - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ] +# targets: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink, tosca.groups.nfv.PlacementGroup ] tosca.policies.nfv.SecurityGroupRule: derived_from: tosca.policies.Root -- cgit 1.2.3-korg