From: Chayal, Avteet (ac229e) <ac229e@att.com>
Date: Fri, 2 Nov 2018 19:17:35 +0000 (+0000)
Subject: Populate serviceResourceId in homing solution
X-Git-Tag: 1.2.4^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F71759%2F1;p=optf%2Fosdf.git

Populate serviceResourceId in homing solution

Fix to populate serviceResourceId in solution to SO
Updated code to pass service_resource_id in HAS payload

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

diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py
index d856a22..f74f461 100644
--- a/osdf/optimizers/placementopt/conductor/translation.py
+++ b/osdf/optimizers/placementopt/conductor/translation.py
@@ -225,7 +225,8 @@ def get_demand_properties(demand, policies):
     for policy_property in get_policy_properties(demand, policies):
         prop = dict(inventory_provider=policy_property['inventoryProvider'],
                     inventory_type=policy_property['inventoryType'],
-                    service_type=demand['serviceResourceId'])
+                    service_type=demand['serviceResourceId'],
+                    service_resource_id=demand['serviceResourceId'])
         prop['attributes'] = dict()
         prop['attributes'].update({'global-customer-id': policy_property['customerId']}
                                   if policy_property['customerId'] else {})
diff --git a/pom.xml b/pom.xml
index d8519e0..224ca8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.onap.optf.osdf</groupId>
     <artifactId>optf-osdf</artifactId>
     <name>optf-osdf</name>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.4-SNAPSHOT</version>
     <description>Optimization Service Design Framework</description>
 
     <properties>
diff --git a/version.properties b/version.properties
index 6988e39..023840b 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=2
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}