diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-09-01 16:38:15 -0400 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2020-09-02 07:27:22 -0400 |
| commit | 83ad920bb05c4f02d1ae2ee5b2196785d2eb61a3 (patch) | |
| tree | 7fd34662bf8b74f37a20c8005423e2dc9d4c8fff /models-interactions | |
| parent | 64591b51d4da3900f37f53701b2ffef4a38778e9 (diff) | |
Add new method to retrieve vnf-id
For guard filters, once the vnf-id is found. Then this convenience
method helps to retrieve the correct vnf information.
Issue-ID: POLICY-2590
Change-Id: I0b55b15582ddc58bbc5b2c0c2c2b130f3cdc88c3
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'models-interactions')
3 files changed, 20 insertions, 1 deletions
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiCqResponse.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiCqResponse.java index 1b18e439c..2648959bb 100644 --- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiCqResponse.java +++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiCqResponse.java @@ -383,6 +383,24 @@ public class AaiCqResponse implements Serializable { } /** + * Returns the VNF given the vnf-id. + * + * @param vnfId The vnf-id + * @return generic Vnf + */ + public GenericVnf getGenericVnfByVnfId(String vnfId) { + List<GenericVnf> genericVnfList = this.getGenericVnfs(); + + for (GenericVnf genVnf : genericVnfList) { + if (vnfId.equals(genVnf.getVnfId())) { + return genVnf; + } + } + + return null; + } + + /** * Get the generic vnf associated with the vserver in the custom query. * * @return Generic VNF diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java index 8a3d6a803..27afb7b73 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java @@ -68,6 +68,7 @@ public class AaiSimulatorJaxRs { @Produces("application/json") public String aaiGetVserverQuery(@QueryParam("filter") final String filter) { if (filter.equals("vserver-name:EQUALS:f953c499-4b1e-426b-8c6d-e9e9f1fc730f") + || filter.equals("vserver-name:EQUALS:Ete_vFWCLvFWSNK_7ba1fbde_0") || filter.equals("vserver-name:EQUALS:OzVServer") || filter.equals("vserver-name:EQUALS:testVserverName")) { return "{\"result-data\":[{\"resource-type\": \"vserver\",\"resource-link\":\"/aai/v15/" diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java index e8d2f7d32..d5d93e07f 100644 --- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java @@ -56,7 +56,7 @@ public class AaiSimulatorTest { @Test public void testCqGet() { final AaiCqResponse response = new AaiManager(new RestManager()).getCustomQueryResponse("http://localhost:6666", - "testUser", "testPass", UUID.randomUUID(), "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"); + "testUser", "testPass", UUID.randomUUID(), "Ete_vFWCLvFWSNK_7ba1fbde_0"); assertNotNull(response); assertEquals("f953c499-4b1e-426b-8c6d-e9e9f1fc730f", response.getVserver().getVserverId()); } |