diff options
11 files changed, 46 insertions, 8 deletions
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index ad7c70c88..b559269b3 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -145,6 +145,12 @@ </exclusions> </dependency> <dependency> + <groupId>com.att.aft</groupId> + <artifactId>dme2</artifactId> + <version>3.1.200-oss</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>1.9.5</version> diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java index 70b717d9d..8867a7828 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java @@ -79,6 +79,8 @@ public class BRMSParamPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java index 458cfc6c6..de884b349 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java @@ -68,6 +68,8 @@ public class ClosedLoopFaultPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java index e00c71d9b..19bb279e6 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java @@ -68,6 +68,8 @@ public class ClosedLoopPMPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java index 5236b28c7..0fcb0027c 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java @@ -93,6 +93,8 @@ public class DecisionPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java index 111a39f8a..4343a5060 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java @@ -37,7 +37,8 @@ import org.onap.policy.api.PolicyParameters; public class FirewallPolicyServiceTest { FirewallPolicyService firewallPolicyService = null; - + + @Before public void setUp() throws Exception { Properties prop = new Properties(); @@ -65,6 +66,8 @@ public class FirewallPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test @@ -89,5 +92,4 @@ public class FirewallPolicyServiceTest { String result = firewallPolicyService.getResult(false); assertEquals("success",result); } - } diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java index 6830fccbd..a9301e728 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java @@ -68,6 +68,8 @@ public class MicroServicesPolicyServiceTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); + PAPServices.junit = false; } @Test diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java index 13f728790..9d1d13910 100644 --- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java +++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java @@ -31,7 +31,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.api.PolicyException; -import org.onap.policy.rest.XACMLRestProperties; import org.onap.policy.xacml.std.pap.StdPAPPolicy; import org.onap.policy.xacml.std.pap.StdPDPPolicy; @@ -53,6 +52,7 @@ public class PAPServicesTest { @After public void tearDown() throws Exception { + PAPServices.setPaps(null); PAPServices.junit = false; } diff --git a/docs/release-notes.rst b/docs/release-notes.rst index bd688683c..bf142ef46 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -12,7 +12,20 @@ Policy Release Notes .. * one section describing the purpose of this new release. .. * This note must be removed after content has been added. -Version: 1.2.0 + +Version: 1.1.3 +-------------- + +:Release Date: 2018-01-18 (Amsterdam Maintenance Release) + +**Bug Fixes** + +The following bugs were deployed with the Amsterdam Maintenance Release: + + * `[POLICY-486] <https://jira.onap.org/browse/POLICY-486>`_ - pdp-x api pushPolicy fails to push latest version + + +Version: 1.1.1 -------------- :Release Date: 2017-11-16 (Amsterdam Release) @@ -83,8 +96,8 @@ The Amsterdam release continued evolving the design driven architecture of and f - Create a Service Instance via VID. - Create a VNF Instance via VID. - Preload SDNC with topology data used for the actual VNF instantiation (both base and DNS scaling modules). NOTE: you may want to set “vlb_name_0” in the base VF module data to something unique. This is the vLB server name that DCAE will pass to Policy during closed loop. If the same name is used multiple times, the Policy name-query to AAI will show multiple entries, one for each occurrence of that vLB VM name in the OpenStack zone. Note that this is not a limitation, typically server names in a domain are supposed to be unique. - - Instantiate the base VF module (vLB, vPacketGen, and one vDNS) via VID. NOTE: The name of the VF module MUST start with Vfmodule_. The same name MUST appear in the SDNC preload of the base VF module topology. We’ll relax this naming requirement for Beijing Release. - - Run heatbridge from the Robot VM using Vfmodule_ … as stack name (it is the actual stack name in OpenStack) + - Instantiate the base VF module (vLB, vPacketGen, and one vDNS) via VID. NOTE: The name of the VF module MUST start with ``Vfmodule_``. The same name MUST appear in the SDNC preload of the base VF module topology. We’ll relax this naming requirement for Beijing Release. + - Run heatbridge from the Robot VM using ``Vfmodule_`` … as stack name (it is the actual stack name in OpenStack) - Populate AAI with a dummy VF module for vDNS scaling. **Security Issues** @@ -93,6 +106,13 @@ The Amsterdam release continued evolving the design driven architecture of and f **Other** - None at this time + +.. note +.. CHANGE HISTORY +.. 01/15/2018 - Added change for version 1.1.3 to the Amsterdam branch. Also corrected prior version (1.2.0) to (1.1.1) +.. 11/16/2017 - Initial document for Amsterdam release. + + End of Release Notes diff --git a/packages/base/src/files/install/servers/brmsgw/dependency.json b/packages/base/src/files/install/servers/brmsgw/dependency.json index c22554293..133907699 100644 --- a/packages/base/src/files/install/servers/brmsgw/dependency.json +++ b/packages/base/src/files/install/servers/brmsgw/dependency.json @@ -82,7 +82,7 @@ "artifactId": "actor.appclcm", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-application.controlloop.common.actorss", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>0.1.1</version> + <version>1.1.0</version> <relativePath/> </parent> |