diff options
| -rwxr-xr-x | osdf/models/policy/placement/tosca/pciPolicy-v20180916.yml | 54 | ||||
| -rw-r--r-- | osdf/optimizers/routeopt/simple_route_opt.py | 2 |
2 files changed, 55 insertions, 1 deletions
diff --git a/osdf/models/policy/placement/tosca/pciPolicy-v20180916.yml b/osdf/models/policy/placement/tosca/pciPolicy-v20180916.yml new file mode 100755 index 0000000..c879195 --- /dev/null +++ b/osdf/models/policy/placement/tosca/pciPolicy-v20180916.yml @@ -0,0 +1,54 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + policy.nodes.pciPolicy: + 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: + - pciPolicy + identity: + type: string + required: true + resources: + type: list + required: true + entry_schema: + type: string + pciProperties: + type: list + required: false + entry_schema: + - type:policy.data.pciProperties_properties +data_types: + policy.data.pciProperties_properties: + derived_from: tosca.nodes.Root + properties: + algoCategory: + type: string + required: false + pciOptmizationAlgoName: + type: string + required: false + pciOptimizationNwConstraint: + type: string + required: false + pciOptimizationPriority: + type: string + required: false + pciOptimizationTimeConstraint: + type: string + required: false diff --git a/osdf/optimizers/routeopt/simple_route_opt.py b/osdf/optimizers/routeopt/simple_route_opt.py index ed179c9..060e1ed 100644 --- a/osdf/optimizers/routeopt/simple_route_opt.py +++ b/osdf/optimizers/routeopt/simple_route_opt.py @@ -44,7 +44,7 @@ class RouteOpt: :return: """ for relationship in logical_link["relationship-list"]["relationship"]: - if relationship["related-to"] == "external-aai-network": + if relationship["related-to"] == "ext-aai-network": return True return False |