diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2017-09-25 21:25:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-25 21:25:04 +0000 |
| commit | 0010271c21479a451a72f64fc8cecc4063aa5ae7 (patch) | |
| tree | 956acab5288c426c96cafb985f5046fe679efdcc /controlloop/common/model-impl | |
| parent | f2686b60b5a38fee187848032115e0b022b31c77 (diff) | |
| parent | 04836227f4d74bc1041c6ceb2438d9f5371f3591 (diff) | |
Merge "Fix Usecase Template for VoLTE"
Diffstat (limited to 'controlloop/common/model-impl')
| -rw-r--r-- | controlloop/common/model-impl/vfc/pom.xml | 6 | ||||
| -rw-r--r-- | controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCManager.java | 13 |
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); } |