diff options
author | Jim Hahn <jrh3@att.com> | 2021-08-06 16:57:45 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-08-06 17:01:08 -0400 |
commit | 031a0fe51dff21445034befc8a6d8732622acd07 (patch) | |
tree | ff7739543e26cb75519b67a514ff4e411339917f /main/src/test/java/org | |
parent | 39159b5a308f5da96f48a3e9d8cd17b42fa5fed4 (diff) |
Leave xacml-pdp REST server always running
Liveness checks depend on the xacml-pdp REST server being available.
However, the REST server is only running when PAP puts it in an active
state. Modified the code to always leave it running.
In a subsequent review, we should split the healthcheck REST service
onto its own port so it can be left running, while the other services
are started/stopped in response to PAP active/passive requests.
Issue-ID: POLICY-3531
Change-Id: I412064abaf91bb966d40adc46cee771b3a0a5dfc
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src/test/java/org')
-rw-r--r-- | main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java | 3 | ||||
-rw-r--r-- | main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java | 32 |
2 files changed, 15 insertions, 20 deletions
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java b/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java index 5ff3d5c7..feaaf4f6 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/XacmlStateTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import org.junit.AfterClass; @@ -130,12 +129,10 @@ public class XacmlStateTest { req.setState(PdpState.ACTIVE); status = state.updateInternalState(req); assertEquals(PdpState.ACTIVE, status.getState()); - verify(act).startXacmlRestController(); req.setState(PdpState.PASSIVE); status = state.updateInternalState(req); assertEquals(PdpState.PASSIVE, status.getState()); - verify(act).stopXacmlRestController(); } @Test diff --git a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java index bb814d37..4286ccf5 100644 --- a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java +++ b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -70,6 +70,17 @@ public class TestXacmlPdpActivator extends CommonRest { activator = new XacmlPdpActivator(parGroup); } + /** + * Teardown tests. + * @throws PolicyXacmlPdpException on termination errors + */ + @After + public void teardown() throws PolicyXacmlPdpException { + if (activator != null && activator.isAlive()) { + activator.stop(); + } + } + @Test public void testXacmlPdpActivator() throws Exception { assertFalse(activator.isAlive()); @@ -77,17 +88,15 @@ public class TestXacmlPdpActivator extends CommonRest { activator.start(); assertTrue(activator.isAlive()); - // XacmlPdp starts in PASSIVE state so the rest controller should not be alive - assertFalse(activator.isXacmlRestControllerAlive()); assertTrue(activator.getParameterGroup().isValid()); assertEquals(CommonTestData.PDPX_PARAMETER_GROUP_NAME, activator.getParameterGroup().getName()); assertEquals(CommonTestData.PDPX_GROUP, activator.getParameterGroup().getPdpGroup()); - activator.startXacmlRestController(); - assertTrue(activator.isXacmlRestControllerAlive()); - activator.stopXacmlRestController(); assertFalse(activator.isXacmlRestControllerAlive()); + + activator.startXacmlRestController(); + assertTrue(activator.isXacmlRestControllerAlive()); } @Test @@ -102,15 +111,4 @@ public class TestXacmlPdpActivator extends CommonRest { activator.stop(); assertFalse(activator.isAlive()); } - - /** - * Teardown tests. - * @throws PolicyXacmlPdpException on termination errors - */ - @After - public void teardown() throws PolicyXacmlPdpException { - if (activator != null && activator.isAlive()) { - activator.stop(); - } - } } |