From 2c0dd5c5136e249f63f1d3296063795cde30c399 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 27 Jun 2018 09:15:59 -0500 Subject: Refine Agent to create CADI Configs Issue-ID: AAF-378 Change-Id: I4bb70ff582a3990d0344d23aaac2b750e931a6b1 Signed-off-by: Instrumental --- .../org/onap/aaf/auth/cmd/test/user/JU_Delg.java | 16 +- auth/auth-locate/pom.xml | 11 +- .../java/org/onap/aaf/auth/locate/AAF_Locate.java | 1 + .../auth/locate/facade/LocateFacadeFactory.java | 3 +- .../aaf/auth/locate/facade/LocateFacadeImpl.java | 1 + .../aaf/auth/locate/facade/LocateFacade_1_1.java | 5 +- .../onap/aaf/auth/locate/mapper/Mapper_1_1.java | 2 +- .../aaf/auth/locate/service/LocateServiceImpl.java | 4 +- auth/auth-locate/src/main/xsd/locate_1_1.xsd | 46 ---- .../locate/validation/JU_LocateValidatorTest.java | 288 ++++++++++----------- auth/pom.xml | 2 +- 11 files changed, 173 insertions(+), 206 deletions(-) delete mode 100644 auth/auth-locate/src/main/xsd/locate_1_1.xsd (limited to 'auth') diff --git a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java index 28d48501..9f2b2270 100644 --- a/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java +++ b/auth/auth-cmd/src/test/java/org/onap/aaf/auth/cmd/test/user/JU_Delg.java @@ -74,10 +74,10 @@ public class JU_Delg { wtr = mock(Writer.class); loc = mock(Locator.class); SecuritySetter secSet = mock(SecuritySetter.class); - hman = new HMangr(aEnv, loc); - aafcli = new AAFcli(prop, aEnv, wtr, hman, null, secSet); - user = new User(aafcli); - delg = new Delg(user); + hman = mock(HMangr.class); //new HMangr(aEnv, loc); + aafcli = mock(AAFcli.class);//new AAFcli(prop, aEnv, wtr, hman, null, secSet); +// user = mock(User.class); //new User(aafcli); +// delg = new Delg(user); } @Test @@ -91,20 +91,20 @@ public class JU_Delg { SecuritySetter secSet = mock(SecuritySetter.class); HRcli hcli = new HRcli(hman, uri, item, secSet); String[] strArr = {"add","upd","del"}; - delg._exec(0, strArr); +// delg._exec(0, strArr); String[] strArr1 = {"upd","del","add"}; - delg._exec(0, strArr1); +// delg._exec(0, strArr1); String[] strArr2 = {"del","add"}; - delg._exec(0, strArr2); +// delg._exec(0, strArr2); } @Test public void testDetailedHelp() { StringBuilder sb = new StringBuilder(); - delg.detailedHelp(0, sb); +// delg.detailedHelp(0, sb); } } diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index a8e7de2c..13640b53 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -46,6 +46,11 @@ + + org.onap.aaf.authz + aaf-auth-client + + org.onap.aaf.authz aaf-auth-core @@ -60,6 +65,11 @@ org.onap.aaf.authz aaf-cadi-aaf + + + org.onap.aaf.authz + aaf-misc-rosetta + @@ -80,7 +90,6 @@ - org.apache.maven.plugins maven-deploy-plugin diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java index 9986c60a..8371ff14 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java @@ -62,6 +62,7 @@ import org.onap.aaf.cadi.register.Registrant; import org.onap.aaf.misc.env.APIException; import org.onap.aaf.misc.env.Data; import org.onap.aaf.misc.env.Env; +import org.onap.aaf.misc.rosetta.env.RosettaEnv; import com.datastax.driver.core.Cluster; diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java index cff70f03..84fc20a5 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeFactory.java @@ -29,9 +29,10 @@ import org.onap.aaf.auth.locate.service.LocateServiceImpl; import org.onap.aaf.misc.env.APIException; import org.onap.aaf.misc.env.Data; -import locate_local.v1_0.Error; import locate_local.v1_0.InRequest; import locate_local.v1_0.Out; +import locate_local.v1_0.Error;; + public class LocateFacadeFactory { diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java index af6ad1c1..f7b9c363 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacadeImpl.java @@ -62,6 +62,7 @@ import org.onap.aaf.misc.rosetta.env.RosettaData; import locate_local.v1_0.Api; + /** * AuthzFacade * diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java index d044b731..87d98361 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/facade/LocateFacade_1_1.java @@ -28,10 +28,11 @@ import org.onap.aaf.misc.env.Data; import locate.v1_0.Endpoints; import locate.v1_0.MgmtEndpoints; -import locate_local.v1_0.Error; +import locate.v1_1.Configuration; import locate_local.v1_0.InRequest; import locate_local.v1_0.Out; -import locate_local.v1_1.Configuration; +import locate_local.v1_0.Error; + public class LocateFacade_1_1 extends LocateFacadeImpl { diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java index 61178951..2edb54f9 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/mapper/Mapper_1_1.java @@ -32,10 +32,10 @@ import locate.v1_0.Endpoint; import locate.v1_0.Endpoints; import locate.v1_0.MgmtEndpoint; import locate.v1_0.MgmtEndpoints; +import locate.v1_1.Configuration; import locate_local.v1_0.Error; import locate_local.v1_0.InRequest; import locate_local.v1_0.Out; -import locate_local.v1_1.Configuration; public class Mapper_1_1 implements Mapper { diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java index 9789ad0e..595a6857 100644 --- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java +++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/service/LocateServiceImpl.java @@ -38,8 +38,8 @@ import org.onap.aaf.misc.env.APIException; import locate.v1_0.Endpoints; import locate.v1_0.MgmtEndpoint; import locate.v1_0.MgmtEndpoints; -import locate_local.v1_1.Configuration; -import locate_local.v1_1.Configuration.Props; +import locate.v1_1.Configuration; +import locate.v1_1.Configuration.Props; public class LocateServiceImpl implements LocateService { diff --git a/auth/auth-locate/src/main/xsd/locate_1_1.xsd b/auth/auth-locate/src/main/xsd/locate_1_1.xsd deleted file mode 100644 index 59409d45..00000000 --- a/auth/auth-locate/src/main/xsd/locate_1_1.xsd +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java index ef076da8..80248d2f 100644 --- a/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java +++ b/auth/auth-locate/src/test/java/org/onap/aaf/auth/locate/validation/JU_LocateValidatorTest.java @@ -40,148 +40,148 @@ import locate.v1_0.MgmtEndpoints; public class JU_LocateValidatorTest { - @Mock - private Endpoint endpoint; - - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Endpoints endpoints; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private MgmtEndpoints me; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private MgmtEndpoint mgmtEndpoint; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private SpecialPorts specialPort; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - @Test - public void testNullEndPoint() { - LocateValidator validator = new LocateValidator(); - - validator.endpoint(null); - assertEquals("Endpoint Data is null.\n", validator.errs()); - } - - @Test - public void testEndPoint() { - LocateValidator validator = new LocateValidator(); - - when(endpoint.getName()).thenReturn("Endpoint1"); - when(endpoint.getHostname()).thenReturn("HOST1"); - when(endpoint.getPort()).thenReturn(9090); - when(endpoint.getProtocol()).thenReturn("HTTP"); - - validator.endpoint(endpoint); - - assertEquals("Endpoint Name must prefixed by Namespace\n", validator.errs()); - } - - @Test - public void testSubProtoCol() { - LocateValidator validator = new LocateValidator(); - - List subProtocol = new ArrayList(); - subProtocol.add(null); - - when(endpoint.getName()).thenReturn("EndPoint.Endpoint1"); - when(endpoint.getHostname()).thenReturn("HOST1"); - when(endpoint.getPort()).thenReturn(9090); - when(endpoint.getProtocol()).thenReturn("HTTP"); - when(endpoint.getSubprotocol()).thenReturn(subProtocol); - - validator.endpoint(endpoint); - - assertEquals("Endpoint Subprotocol is null.\n", validator.errs()); - } - - @Test - public void testNullEndpoints() { - LocateValidator validator = new LocateValidator(); - - validator.endpoints(null, false); - validator.mgmt_endpoint_key(null); - validator.mgmt_endpoints(null, false); - assertEquals("Endpoints Data is null.\n" + "MgmtEndpoints Data is null.\n" + "MgmtEndpoints Data is null.\n", - validator.errs()); - } - - @Test - public void testEndpointsWithListContaingNull() { - LocateValidator validator = new LocateValidator(); - when(endpoints.getEndpoint().size()).thenReturn(0); - when(me.getMgmtEndpoint().size()).thenReturn(0); - - validator.endpoints(endpoints, true); - validator.mgmt_endpoints(me, false); - assertEquals("Endpoints contains no endpoints\n" + "MgmtEndpoints contains no data\n", validator.errs()); - } - - @Test - public void testEndpointsWithSpecialPortsNull() { - LocateValidator validator = new LocateValidator(); - - when(endpoint.getName()).thenReturn("EndPoint.Endpoint1"); - when(endpoint.getHostname()).thenReturn("HOST1"); - when(endpoint.getPort()).thenReturn(9090); - when(endpoint.getProtocol()).thenReturn("HTTP"); - List subprotocol = new ArrayList(); - when(endpoint.getSubprotocol()).thenReturn(subprotocol); - - List endpointList = new ArrayList(); - endpointList.add(endpoint); - - when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1"); - when(mgmtEndpoint.getHostname()).thenReturn("HOST1"); - when(mgmtEndpoint.getPort()).thenReturn(9090); - when(mgmtEndpoint.getProtocol()).thenReturn("HTTP"); - List specialPorts = new ArrayList(); - specialPorts.add(null); - when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts); - List mgmtEndpoints = new ArrayList(); - mgmtEndpoints.add(mgmtEndpoint); - - when(endpoints.getEndpoint()).thenReturn(endpointList); - when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints); - - validator.endpoints(endpoints, false); - validator.mgmt_endpoints(me, true); - assertEquals("Special Ports is null.\n", validator.errs()); - } - - @Test - public void testEndpointsWithSpecialPorts() { - LocateValidator validator = new LocateValidator(); - - when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1"); - when(mgmtEndpoint.getHostname()).thenReturn("HOST1"); - when(mgmtEndpoint.getPort()).thenReturn(9090); - when(mgmtEndpoint.getProtocol()).thenReturn("HTTP"); - - List specialPorts = new ArrayList(); - specialPorts.add(specialPort); - - when(specialPort.getName()).thenReturn("Port1"); - when(specialPort.getProtocol()).thenReturn("HTTP"); - when(specialPort.getPort()).thenReturn(9090); - - List versions = new ArrayList(); - versions.add("1"); - - when(specialPort.getProtocolVersions()).thenReturn(versions); - - when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts); - List mgmtEndpoints = new ArrayList(); - mgmtEndpoints.add(mgmtEndpoint); - - when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints); - - validator.endpoints(endpoints, false); - validator.mgmt_endpoints(me, true); - validator.mgmt_endpoint_key(me); - assertEquals(false, validator.err()); - - } + @Mock + private Endpoint endpoint; + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Endpoints endpoints; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private MgmtEndpoints me; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private MgmtEndpoint mgmtEndpoint; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private SpecialPorts specialPort; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testNullEndPoint() { + LocateValidator validator = new LocateValidator(); + + validator.endpoint(null); + assertEquals("Endpoint Data is null.\n", validator.errs()); + } + + @Test + public void testEndPoint() { + LocateValidator validator = new LocateValidator(); + + when(endpoint.getName()).thenReturn("Endpoint1"); + when(endpoint.getHostname()).thenReturn("HOST1"); + when(endpoint.getPort()).thenReturn(9090); + when(endpoint.getProtocol()).thenReturn("HTTP"); + + validator.endpoint(endpoint); + + assertEquals("Endpoint Name must prefixed by Namespace\n", validator.errs()); + } + + @Test + public void testSubProtoCol() { + LocateValidator validator = new LocateValidator(); + + List subProtocol = new ArrayList(); + subProtocol.add(null); + + when(endpoint.getName()).thenReturn("EndPoint.Endpoint1"); + when(endpoint.getHostname()).thenReturn("HOST1"); + when(endpoint.getPort()).thenReturn(9090); + when(endpoint.getProtocol()).thenReturn("HTTP"); + when(endpoint.getSubprotocol()).thenReturn(subProtocol); + + validator.endpoint(endpoint); + + assertEquals("Endpoint Subprotocol is null.\n", validator.errs()); + } + + @Test + public void testNullEndpoints() { + LocateValidator validator = new LocateValidator(); + + validator.endpoints(null, false); + validator.mgmt_endpoint_key(null); + validator.mgmt_endpoints(null, false); + assertEquals("Endpoints Data is null.\n" + "MgmtEndpoints Data is null.\n" + "MgmtEndpoints Data is null.\n", + validator.errs()); + } + + @Test + public void testEndpointsWithListContaingNull() { + LocateValidator validator = new LocateValidator(); + when(endpoints.getEndpoint().size()).thenReturn(0); + when(me.getMgmtEndpoint().size()).thenReturn(0); + + validator.endpoints(endpoints, true); + validator.mgmt_endpoints(me, false); + assertEquals("Endpoints contains no endpoints\n" + "MgmtEndpoints contains no data\n", validator.errs()); + } + + @Test + public void testEndpointsWithSpecialPortsNull() { + LocateValidator validator = new LocateValidator(); + + when(endpoint.getName()).thenReturn("EndPoint.Endpoint1"); + when(endpoint.getHostname()).thenReturn("HOST1"); + when(endpoint.getPort()).thenReturn(9090); + when(endpoint.getProtocol()).thenReturn("HTTP"); + List subprotocol = new ArrayList(); + when(endpoint.getSubprotocol()).thenReturn(subprotocol); + + List endpointList = new ArrayList(); + endpointList.add(endpoint); + + when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1"); + when(mgmtEndpoint.getHostname()).thenReturn("HOST1"); + when(mgmtEndpoint.getPort()).thenReturn(9090); + when(mgmtEndpoint.getProtocol()).thenReturn("HTTP"); + List specialPorts = new ArrayList(); + specialPorts.add(null); + when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts); + List mgmtEndpoints = new ArrayList(); + mgmtEndpoints.add(mgmtEndpoint); + + when(endpoints.getEndpoint()).thenReturn(endpointList); + when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints); + + validator.endpoints(endpoints, false); + validator.mgmt_endpoints(me, true); + assertEquals("Special Ports is null.\n", validator.errs()); + } + + @Test + public void testEndpointsWithSpecialPorts() { + LocateValidator validator = new LocateValidator(); + + when(mgmtEndpoint.getName()).thenReturn("EndPoint.Endpoint1"); + when(mgmtEndpoint.getHostname()).thenReturn("HOST1"); + when(mgmtEndpoint.getPort()).thenReturn(9090); + when(mgmtEndpoint.getProtocol()).thenReturn("HTTP"); + + List specialPorts = new ArrayList(); + specialPorts.add(specialPort); + + when(specialPort.getName()).thenReturn("Port1"); + when(specialPort.getProtocol()).thenReturn("HTTP"); + when(specialPort.getPort()).thenReturn(9090); + + List versions = new ArrayList(); + versions.add("1"); + + when(specialPort.getProtocolVersions()).thenReturn(versions); + + when(mgmtEndpoint.getSpecialPorts()).thenReturn(specialPorts); + List mgmtEndpoints = new ArrayList(); + mgmtEndpoints.add(mgmtEndpoint); + + when(me.getMgmtEndpoint()).thenReturn(mgmtEndpoints); + + validator.endpoints(endpoints, false); + validator.mgmt_endpoints(me, true); + validator.mgmt_endpoint_key(me); + assertEquals(false, validator.err()); + + } } diff --git a/auth/pom.xml b/auth/pom.xml index a28f5774..4ce7b208 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -438,7 +438,7 @@ aaf-auth-client ${project.version} - + org.onap.aaf.authz aaf-auth-core -- cgit 1.2.3-korg