diff options
24 files changed, 26 insertions, 25 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml index c786d74..7eced05 100644 --- a/config/common_config.yaml +++ b/config/common_config.yaml @@ -67,9 +67,10 @@ policy_info: placement: policy_fetch: by_scope policy_scope: - default_scope: OSDF_CASABLANCA - vcpe_scope: OSDF_CASABLANCA + default_scope: OSDF_DUBLIN + vcpe_scope: OSDF_DUBLIN vfw_scope: OSDF_DUBLIN + td_scope: OSDF_DUBLIN secondary_scopes: - - get_param: service_name diff --git a/osdf/templates/conductor_interface.json b/osdf/templates/conductor_interface.json index 04ed29f..030d6a0 100755 --- a/osdf/templates/conductor_interface.json +++ b/osdf/templates/conductor_interface.json @@ -2,7 +2,7 @@ "name": "{{ name }}", "files": {}, "timeout": {{ timeout }}, - "num_solution": {{ limit }}, + "num_solution": "{{ limit }}", "template": { "homing_template_version": "2017-10-10", "parameters": { @@ -27,7 +27,7 @@ <groupId>org.onap.optf.osdf</groupId> <artifactId>optf-osdf</artifactId> <name>optf-osdf</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <description>Optimization Service Design Framework</description> <properties> diff --git a/test/placement-tests/request_placement_vfmod.json b/test/placement-tests/request_placement_vfmod.json index 21b9268..e4186d6 100644 --- a/test/placement-tests/request_placement_vfmod.json +++ b/test/placement-tests/request_placement_vfmod.json @@ -86,7 +86,7 @@ }, "homing_template_version": "2017-10-10" }, - "num_solution": 100, + "num_solution": "100", "files": {}, "timeout": 1200 } diff --git a/test/policy-local-files/Affinity_vCPE_1.json b/test/policy-local-files/Affinity_vCPE_1.json index 0f7efc3..2953589 100644 --- a/test/policy-local-files/Affinity_vCPE_1.json +++ b/test/policy-local-files/Affinity_vCPE_1.json @@ -1,6 +1,6 @@ { "service": "affinityPolicy", - "policyName": "OSDF_CASABLANCA.Affinity_vCPE_1", + "policyName": "OSDF_DUBLIN.Affinity_vCPE_1", "description": "Zone policy for vCPE", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Capacity_vFW_1.json b/test/policy-local-files/Capacity_vFW_1.json index 3393550..d5e80ab 100644 --- a/test/policy-local-files/Capacity_vFW_1.json +++ b/test/policy-local-files/Capacity_vFW_1.json @@ -1,6 +1,6 @@ { "service": "vim_fit", - "policyName": "OSDF_CASABLANCA.Capacity_vFW_1", + "policyName": "OSDF_DUBLIN.Capacity_vFW_1", "description": "Capacity policy for vFW", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Capacity_vGMuxInfra.json b/test/policy-local-files/Capacity_vGMuxInfra.json index f5abc42..010cf3f 100644 --- a/test/policy-local-files/Capacity_vGMuxInfra.json +++ b/test/policy-local-files/Capacity_vGMuxInfra.json @@ -1,6 +1,6 @@ { "service": "vim_fit", - "policyName": "OSDF_CASABLANCA.Capacity_vGMuxInfra", + "policyName": "OSDF_DUBLIN.Capacity_vGMuxInfra", "description": "Capacity policy for vGMuxInfra", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Capacity_vG_1.json b/test/policy-local-files/Capacity_vG_1.json index 6fa1f2d..fedcc4f 100644 --- a/test/policy-local-files/Capacity_vG_1.json +++ b/test/policy-local-files/Capacity_vG_1.json @@ -1,6 +1,6 @@ { "service": "vim_fit", - "policyName": "OSDF_CASABLANCA.Capacity_vG_1", + "policyName": "OSDF_DUBLIN.Capacity_vG_1", "description": "Capacity policy for vG", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Distance_vFW_1.json b/test/policy-local-files/Distance_vFW_1.json index f6cb198..80e08d9 100644 --- a/test/policy-local-files/Distance_vFW_1.json +++ b/test/policy-local-files/Distance_vFW_1.json @@ -1,6 +1,6 @@ { "service": "distancePolicy", - "policyName": "OSDF_CASABLANCA.Distance_vFW_1", + "policyName": "OSDF_DUBLIN.Distance_vFW_1", "description": "Distance Policy for vFW", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Distance_vGMuxInfra_1.json b/test/policy-local-files/Distance_vGMuxInfra_1.json index 5d22702..e3ba83c 100644 --- a/test/policy-local-files/Distance_vGMuxInfra_1.json +++ b/test/policy-local-files/Distance_vGMuxInfra_1.json @@ -1,6 +1,6 @@ { "service": "distancePolicy", - "policyName": "OSDF_CASABLANCA.Distance_vGMuxInfra", + "policyName": "OSDF_DUBLIN.Distance_vGMuxInfra", "description": "Distance Policy for vGMuxInfra", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Distance_vG_1.json b/test/policy-local-files/Distance_vG_1.json index a326331..c498c7a 100644 --- a/test/policy-local-files/Distance_vG_1.json +++ b/test/policy-local-files/Distance_vG_1.json @@ -1,6 +1,6 @@ { "service": "distancePolicy", - "policyName": "OSDF_CASABLANCA.Distance_vG_1", + "policyName": "OSDF_DUBLIN.Distance_vG_1", "description": "Distance Policy for vG", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json index 8632b6b..9b062b0 100644 --- a/test/policy-local-files/Placement_Optimization_1.json +++ b/test/policy-local-files/Placement_Optimization_1.json @@ -1,6 +1,6 @@ { "service": "optimizationPolicy", - "policyName": "OSDF_CASABLANCA.Placement_Optimization_1", + "policyName": "OSDF_DUBLIN.Placement_Optimization_1", "description": "Placement Optimization Policy for vGMuxInfra", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/QueryPolicy_vCPE.json b/test/policy-local-files/QueryPolicy_vCPE.json index 7d5aad2..5097964 100644 --- a/test/policy-local-files/QueryPolicy_vCPE.json +++ b/test/policy-local-files/QueryPolicy_vCPE.json @@ -1,6 +1,6 @@ { "service": "queryPolicy", - "policyName": "OSDF_CASABLANCA.QueryPolicy_vCPE", + "policyName": "OSDF_DUBLIN.QueryPolicy_vCPE", "description": "Query policy for vCPE", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/QueryPolicy_vCPE_2.json b/test/policy-local-files/QueryPolicy_vCPE_2.json index 512989f..e398f39 100644 --- a/test/policy-local-files/QueryPolicy_vCPE_2.json +++ b/test/policy-local-files/QueryPolicy_vCPE_2.json @@ -1,6 +1,6 @@ { "service": "queryPolicy", - "policyName": "OSDF_CASABLANCA.queryPolicy_vCPE", + "policyName": "OSDF_DUBLIN.queryPolicy_vCPE", "description": "Query policy for vCPE", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/QueryPolicy_vFW.json b/test/policy-local-files/QueryPolicy_vFW.json index 443a82a..932074b 100644 --- a/test/policy-local-files/QueryPolicy_vFW.json +++ b/test/policy-local-files/QueryPolicy_vFW.json @@ -1,6 +1,6 @@ { "service": "queryPolicy", - "policyName": "OSDF_CASABLANCA.QueryPolicy_vFW", + "policyName": "OSDF_DUBLIN.QueryPolicy_vFW", "description": "Query policy for vFW", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/hpa_policy_vFW_1.json b/test/policy-local-files/hpa_policy_vFW_1.json index 4a81dc3..a60ad47 100644 --- a/test/policy-local-files/hpa_policy_vFW_1.json +++ b/test/policy-local-files/hpa_policy_vFW_1.json @@ -1,6 +1,6 @@ { "service": "hpaPolicy", - "policyName": "OSDF_CASABLANCA.hpa_policy_vFW_1", + "policyName": "OSDF_DUBLIN.hpa_policy_vFW_1", "description": "HPA policy for vFW", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json index 8ee0469..690f5dc 100644 --- a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json +++ b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json @@ -1,6 +1,6 @@ { "service": "hpaPolicy", - "policyName": "OSDF_CASABLANCA.hpa_policy_vGMuxInfra_1", + "policyName": "OSDF_DUBLIN.hpa_policy_vGMuxInfra_1", "description": "HPA policy for vGMuxInfra", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/hpa_policy_vG_1.json b/test/policy-local-files/hpa_policy_vG_1.json index 2bdba31..b29c67d 100644 --- a/test/policy-local-files/hpa_policy_vG_1.json +++ b/test/policy-local-files/hpa_policy_vG_1.json @@ -1,6 +1,6 @@ { "service": "hpaPolicy", - "policyName": "OSDF_CASABLANCA.hpa_policy_vG_1", + "policyName": "OSDF_DUBLIN.hpa_policy_vG_1", "description": "HPA policy for vG", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/subscriber_policy_vCPE.json b/test/policy-local-files/subscriber_policy_vCPE.json index bd56dfc..9359c20 100644 --- a/test/policy-local-files/subscriber_policy_vCPE.json +++ b/test/policy-local-files/subscriber_policy_vCPE.json @@ -1,6 +1,6 @@ { "service": "subscriberPolicy", - "policyName": "OSDF_CASABLANCA.SubscriberPolicy_v1", + "policyName": "OSDF_DUBLIN.SubscriberPolicy_v1", "description": "Subscriber Policy for vCPE", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/subscriber_policy_vFW.json b/test/policy-local-files/subscriber_policy_vFW.json index 38e615c..299da04 100644 --- a/test/policy-local-files/subscriber_policy_vFW.json +++ b/test/policy-local-files/subscriber_policy_vFW.json @@ -1,6 +1,6 @@ { "service": "subscriberPolicy", - "policyName": "OSDF_CASABLANCA.SubscriberPolicy_v1", + "policyName": "OSDF_DUBLIN.SubscriberPolicy_v1", "description": "Subscriber Policy for VFW", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/vnfPolicy_vFW.json b/test/policy-local-files/vnfPolicy_vFW.json index a29d927..0b7d9a2 100644 --- a/test/policy-local-files/vnfPolicy_vFW.json +++ b/test/policy-local-files/vnfPolicy_vFW.json @@ -1,6 +1,6 @@ { "service": "vnfPolicy", - "policyName": "OSDF_CASABLANCA.vnfPolicy_vFW", + "policyName": "OSDF_DUBLIN.vnfPolicy_vFW", "description": "vnfPolicy", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/vnfPolicy_vG.json b/test/policy-local-files/vnfPolicy_vG.json index 2a56426..b047686 100644 --- a/test/policy-local-files/vnfPolicy_vG.json +++ b/test/policy-local-files/vnfPolicy_vG.json @@ -1,6 +1,6 @@ { "service": "vnfPolicy", - "policyName": "OSDF_CASABLANCA.vnfPolicy_vG", + "policyName": "OSDF_DUBLIN.vnfPolicy_vG", "description": "vnfPolicy", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/test/policy-local-files/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/vnfPolicy_vGMuxInfra.json index c8fd604..45d67f6 100644 --- a/test/policy-local-files/vnfPolicy_vGMuxInfra.json +++ b/test/policy-local-files/vnfPolicy_vGMuxInfra.json @@ -1,6 +1,6 @@ { "service": "vnfPolicy", - "policyName": "OSDF_CASABLANCA.vnfPolicy_vGMuxInfra", + "policyName": "OSDF_DUBLIN.vnfPolicy_vGMuxInfra", "description": "vnfPolicy", "templateVersion": "OpenSource.version.1", "version": "test1", diff --git a/version.properties b/version.properties index 36696ce..3d14ded 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=3 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |