aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/model-impl
diff options
context:
space:
mode:
authordaniel <dc443y@att.com>2017-09-25 15:50:33 -0500
committerdaniel <dc443y@att.com>2017-09-25 15:57:16 -0500
commit04836227f4d74bc1041c6ceb2438d9f5371f3591 (patch)
treed65142f6332e67393927250342c4e9820d2a9e22 /controlloop/common/model-impl
parentfd96af9ed800232811067e164e51554eea08a167 (diff)
Fix Usecase Template for VoLTE
This includes VoLTE support for the amsterdam template. As of right now all use cases are able to get a final success with guard disabled and no A&AI GET queries. Currently, the GET query is not working in the lab. I will address this in another pull request. Issue-ID: POLICY-259 Change-Id: I216aa84daaa1e93ab12c56ee53283b4cb413a7c3 Signed-off-by: Daniel Cruz<dc443y@att.com>
Diffstat (limited to 'controlloop/common/model-impl')
-rw-r--r--controlloop/common/model-impl/vfc/pom.xml6
-rw-r--r--controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java13
2 files changed, 16 insertions, 3 deletions
diff --git a/controlloop/common/model-impl/vfc/pom.xml b/controlloop/common/model-impl/vfc/pom.xml
index 7672b1bc9..6b4efb879 100644
--- a/controlloop/common/model-impl/vfc/pom.xml
+++ b/controlloop/common/model-impl/vfc/pom.xml
@@ -51,5 +51,11 @@
<version>6.5.0.Final</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.onap.policy.drools-pdp</groupId>
+ <artifactId>policy-management</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
index 5cb6d6624..2d635b401 100644
--- a/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
+++ b/controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.drools.core.WorkingMemory;
import org.onap.policy.vfc.util.Serialization;
+import org.onap.policy.drools.system.PolicyEngine;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
import org.slf4j.Logger;
@@ -42,9 +43,15 @@ public final class VFCManager implements Runnable {
public VFCManager(WorkingMemory wm, VFCRequest request) {
workingMem = wm;
vfcRequest = request;
- // TODO: Get base URL, username and password from MSB?
- // TODO: Following code is a placeholder, needs to be updated
- setVFCParams("http://localhost:6668", "username", "password");
+
+ /*
+ * TODO: What if these are null?
+ */
+ String url = PolicyEngine.manager.getEnvironmentProperty("vfc.url");
+ String username = PolicyEngine.manager.getEnvironmentProperty("vfc.username");
+ String password = PolicyEngine.manager.getEnvironmentProperty("vfc.password");
+
+ setVFCParams(url, username, password);
}