aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-15 10:27:24 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-03-15 11:04:25 -0400
commit4d23287f72f42103521d2b7738e93e79532b0246 (patch)
treeb28ab5eebd791d5ce656ef1fe6f7b9a7f6265dab
parentd7cb7d23b95b0a1d7aef52b6ba0832caa1a9fd73 (diff)
Fill in legacy JSON models
Fill in the bodies of the guard and operational JSON models. Issue-ID: POLICY-1195 Change-Id: If15dd8fa89e7a2b9d823eab51ac0b0f8819dd9d4 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicy.java13
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicy.java12
-rw-r--r--models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicyTest.java51
-rw-r--r--models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicyTest.java43
-rw-r--r--pom.xml1
5 files changed, 119 insertions, 1 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicy.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicy.java
index a365696c3..30e62eb93 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicy.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicy.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,11 +21,23 @@
package org.onap.policy.models.tosca.serialization.legacy;
+import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
+
/**
* Definition of a legacy guard policy stored as a TOSCA policy.
*
* @author Liam Fallon (liam.fallon@est.tech)
*/
+@Data
public class LegacyGuardPolicy {
+ private String policyId;
+
+ private String policyVersion;
+
+ private List<Map<String, String>> content;
+
}
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicy.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicy.java
index 0b63f2d68..358d70247 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicy.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicy.java
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,11 +21,20 @@
package org.onap.policy.models.tosca.serialization.legacy;
+import lombok.Data;
+
/**
* Definition of a legacy operational policy stored as a TOSCA policy.
*
* @author Liam Fallon (liam.fallon@est.tech)
*/
+@Data
public class LegacyOperationalPolicy {
-}
+ private String policyId;
+
+ private String policyVersion;
+
+ private String content;
+
+} \ No newline at end of file
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicyTest.java
new file mode 100644
index 000000000..fa082331a
--- /dev/null
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyGuardPolicyTest.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.serialization.legacy;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+public class LegacyGuardPolicyTest {
+
+ @Test
+ public void test() {
+ LegacyGuardPolicy guard = new LegacyGuardPolicy();
+ assertNotNull(guard);
+ guard.setPolicyId("guard.frequency");
+ assertEquals("guard.frequency", guard.getPolicyId());
+ guard.setPolicyVersion("1");
+ assertEquals("1", guard.getPolicyVersion());
+ Map<String, String> body = new HashMap<>();
+ body.put("actor", "SO");
+ List<Map<String, String>> content = new ArrayList<>();
+ content.add(body);
+ guard.setContent(content);
+ assertEquals(1, guard.getContent().size());
+ }
+
+}
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicyTest.java
new file mode 100644
index 000000000..13da63247
--- /dev/null
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/serialization/legacy/LegacyOperationalPolicyTest.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.models.tosca.serialization.legacy;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class LegacyOperationalPolicyTest {
+
+ @Test
+ public void test() {
+ LegacyOperationalPolicy policy = new LegacyOperationalPolicy();
+ assertNotNull(policy);
+ policy.setPolicyId("onap.scaleout");
+ assertEquals("onap.scaleout", policy.getPolicyId());
+ policy.setPolicyVersion("1");
+ assertEquals("1", policy.getPolicyVersion());
+ policy.setContent("controlLoop%3A%0A%20%20");
+ assertTrue(policy.getContent().length() > 0);
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index 245dfc9fc..5a22b5232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
<version>2.1.0-SNAPSHOT</version>
+ <relativePath />
</parent>
<groupId>org.onap.policy.models</groupId>