/*-
* ============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.
public class ExceptionsTest {
+ private static final String STRING_TEXT = "String";
+ private static final String MESSAGE = "Message";
+
@Test
public void test() {
- assertNotNull(new PfModelException(Response.Status.OK, "Message"));
- assertNotNull(new PfModelException(Response.Status.OK, "Message", "String"));
- assertNotNull(new PfModelException(Response.Status.OK, "Message", new IOException()));
- assertNotNull(new PfModelException(Response.Status.OK, "Message", new IOException(), "String"));
+ assertNotNull(new PfModelException(Response.Status.OK, MESSAGE));
+ assertNotNull(new PfModelException(Response.Status.OK, MESSAGE, STRING_TEXT));
+ assertNotNull(new PfModelException(Response.Status.OK, MESSAGE, new IOException()));
+ assertNotNull(new PfModelException(Response.Status.OK, MESSAGE, new IOException(), STRING_TEXT));
String key = "A String";
PfModelException ae =
- new PfModelException(Response.Status.OK, "Message", new IOException("IO exception message"), key);
+ new PfModelException(Response.Status.OK, MESSAGE, new IOException("IO exception message"), key);
ErrorResponse errorResponse = ae.getErrorResponse();
assertEquals("Message\nIO exception message", String.join("\n", errorResponse.getErrorDetails()));
assertEquals(key, ae.getObject());
- assertNotNull(new PfModelRuntimeException(Response.Status.OK, "Message"));
- assertNotNull(new PfModelRuntimeException(Response.Status.OK, "Message", "String"));
- assertNotNull(new PfModelRuntimeException(Response.Status.OK, "Message", new IOException()));
- assertNotNull(new PfModelRuntimeException(Response.Status.OK, "Message", new IOException(), "String"));
+ assertNotNull(new PfModelRuntimeException(Response.Status.OK, MESSAGE));
+ assertNotNull(new PfModelRuntimeException(Response.Status.OK, MESSAGE, STRING_TEXT));
+ assertNotNull(new PfModelRuntimeException(Response.Status.OK, MESSAGE, new IOException()));
+ assertNotNull(new PfModelRuntimeException(Response.Status.OK, MESSAGE, new IOException(), STRING_TEXT));
String rkey = "A String";
PfModelRuntimeException re = new PfModelRuntimeException(Response.Status.OK, "Runtime Message",
/*-
* ============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.
package org.onap.policy.models.base;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Test;
import org.onap.policy.models.base.testconcepts.DummyPfModel;
public class ModelServiceTest {
+ private static final String MODEL_KEY_IS_NULL = "modelKey is marked @NonNull but is null";
+ private static final String MODEL_NAME = "ModelName";
+
@Test
public void testModelService() {
PfModelService.clear();
assertFalse(PfModelService.existsModel("NonExistantName"));
- try {
- PfModelService.getModel("NonExistantName");
- } catch (final Exception e) {
- assertEquals("Model for name NonExistantName not found in model service", e.getMessage());
- }
+ assertThatThrownBy(() -> PfModelService.getModel("NonExistantName"))
+ .hasMessage("Model for name NonExistantName not found in model service");
- PfModelService.registerModel("ModelName", new DummyPfModel());
- assertTrue(PfModelService.existsModel("ModelName"));
- assertNotNull(PfModelService.getModel("ModelName"));
+ PfModelService.registerModel(MODEL_NAME, new DummyPfModel());
+ assertTrue(PfModelService.existsModel(MODEL_NAME));
+ assertNotNull(PfModelService.getModel(MODEL_NAME));
- PfModelService.deregisterModel("ModelName");
+ PfModelService.deregisterModel(MODEL_NAME);
- assertFalse(PfModelService.existsModel("ModelName"));
- try {
- PfModelService.getModel("ModelName");
- } catch (final Exception e) {
- assertEquals("Model for name ModelName not found in model service", e.getMessage());
- }
+ assertFalse(PfModelService.existsModel(MODEL_NAME));
+ assertThatThrownBy(() -> PfModelService.getModel(MODEL_NAME))
+ .hasMessage("Model for name ModelName not found in model service");
- PfModelService.registerModel("ModelName", new DummyPfModel());
- assertTrue(PfModelService.existsModel("ModelName"));
- assertNotNull(PfModelService.getModel("ModelName"));
+ PfModelService.registerModel(MODEL_NAME, new DummyPfModel());
+ assertTrue(PfModelService.existsModel(MODEL_NAME));
+ assertNotNull(PfModelService.getModel(MODEL_NAME));
PfModelService.clear();
- assertFalse(PfModelService.existsModel("ModelName"));
- try {
- PfModelService.getModel("ModelName");
- } catch (final Exception e) {
- assertEquals("Model for name ModelName not found in model service", e.getMessage());
- }
-
- try {
- PfModelService.registerModel(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("modelKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- PfModelService.registerModel("nullModelName", null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("model is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- PfModelService.registerModel(null, new DummyPfModel());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("modelKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- PfModelService.deregisterModel(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("modelKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- PfModelService.getModel(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("modelKey is marked @NonNull but is null", exc.getMessage());
- }
+ assertFalse(PfModelService.existsModel(MODEL_NAME));
+ assertThatThrownBy(() -> PfModelService.getModel(MODEL_NAME))
+ .hasMessage("Model for name ModelName not found in model service");
+
+ assertThatThrownBy(() -> PfModelService.registerModel(null, null))
+ .hasMessage(MODEL_KEY_IS_NULL);
+
+ assertThatThrownBy(() -> PfModelService.registerModel("nullModelName", null))
+ .hasMessage("model is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> PfModelService.registerModel(null, new DummyPfModel()))
+ .hasMessage(MODEL_KEY_IS_NULL);
+
+ assertThatThrownBy(() -> PfModelService.deregisterModel(null))
+ .hasMessage(MODEL_KEY_IS_NULL);
+
+ assertThatThrownBy(() -> PfModelService.getModel(null)).hasMessage(MODEL_KEY_IS_NULL);
}
}
/*-
* ============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.
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.testconcepts.DummyAuthorativeConcept;
import org.onap.policy.models.base.testconcepts.DummyBadPfConceptContainer;
*/
public class PfConceptContainerTest {
+ private static final String NAME2 = "name2";
+ private static final String NAME1 = "name1";
+ private static final String NAME0 = "name0";
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String DUMMY_VALUE = "Dummy";
+ private static final String VERSION0 = "0.0.1";
+
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testConceptContainer() {
container = new DummyPfConceptContainer(new PfConceptKey(), new TreeMap<PfConceptKey, DummyPfConcept>());
assertNotNull(container);
- try {
- new PfConceptContainer((PfConceptKey) null, null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- container = new DummyPfConceptContainer((PfConceptKey) null, null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- container = new DummyPfConceptContainer(new PfConceptKey(), null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- container = new DummyPfConceptContainer(null, new TreeMap<PfConceptKey, DummyPfConcept>());
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- container.getKey().setName("Dummy");
+ assertThatThrownBy(() -> new PfConceptContainer((PfConceptKey) null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer((PfConceptKey) null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer(new PfConceptKey(), null))
+ .hasMessage("conceptMap is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new DummyPfConceptContainer(null, new TreeMap<PfConceptKey, DummyPfConcept>()))
+ .hasMessage(KEY_IS_NULL);
+
+ container.getKey().setName(DUMMY_VALUE);
DummyPfConceptContainer clonedContainer = new DummyPfConceptContainer(container);
assertNotNull(clonedContainer);
- assertEquals("Dummy", clonedContainer.getKey().getName());
+ assertEquals(DUMMY_VALUE, clonedContainer.getKey().getName());
- try {
- DummyPfConceptContainer conceptContainter = null;
- container = new DummyPfConceptContainer(conceptContainter);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new DummyPfConceptContainer((DummyPfConceptContainer) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
List<PfKey> keyList = container.getKeys();
assertEquals(1, keyList.size());
- PfConceptKey conceptKey = new PfConceptKey("Key", "0.0.1");
+ PfConceptKey conceptKey = new PfConceptKey("Key", VERSION0);
Map<PfConceptKey, DummyPfConcept> conceptMap = new TreeMap<>();
conceptMap.put(conceptKey, new DummyPfConcept(conceptKey));
clonedContainer = new DummyPfConceptContainer(container);
assertNotNull(clonedContainer);
- assertEquals("Dummy", clonedContainer.getKey().getName());
+ assertEquals(DUMMY_VALUE, clonedContainer.getKey().getName());
assertEquals(2, clonedContainer.getKeys().size());
assertEquals(clonedContainer, container);
assertEquals(0, container.compareTo(clonedContainer));
- try {
- container.copyTo(null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ final DummyPfConceptContainer container2 = container;
+ assertThatThrownBy(() -> container2.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertFalse(container.compareTo(null) == 0);
assertEquals(0, container.compareTo(container));
testContainer.getKey().setVersion(container.getKey().getVersion());
assertEquals(0, container.compareTo(testContainer));
- PfConceptKey testConceptKey = new PfConceptKey("TestKey", "0.0.1");
+ PfConceptKey testConceptKey = new PfConceptKey("TestKey", VERSION0);
testContainer.getConceptMap().put(testConceptKey, new DummyPfConcept(testConceptKey));
assertFalse(container.compareTo(testContainer) == 0);
- try {
- container.validate(null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ final DummyPfConceptContainer container3 = container;
+ assertThatThrownBy(() -> container3.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
DummyPfConceptContainer validateContainer = new DummyPfConceptContainer();
assertFalse(validateContainer.validate(new PfValidationResult()).isOk());
- validateContainer.setKey(new PfConceptKey("VCKey", "0.0.1"));
+ validateContainer.setKey(new PfConceptKey("VCKey", VERSION0));
assertFalse(validateContainer.validate(new PfValidationResult()).isOk());
validateContainer.getConceptMap().put(testConceptKey, new DummyPfConcept(testConceptKey));
@Test
public void testAuthorative() {
Map<String, DummyAuthorativeConcept> dacMap = new LinkedHashMap<>();
- dacMap.put("name0", new DummyAuthorativeConcept("name0", "1.2.3", "Hello"));
- dacMap.put("name1", new DummyAuthorativeConcept(PfKey.NULL_KEY_NAME, PfKey.NULL_KEY_VERSION, "Hi"));
- dacMap.put("name2", new DummyAuthorativeConcept("name2", "1.2.3", "Howdy"));
+ dacMap.put(NAME0, new DummyAuthorativeConcept(NAME0, "1.2.3", "Hello"));
+ dacMap.put(NAME1, new DummyAuthorativeConcept(PfKey.NULL_KEY_NAME, PfKey.NULL_KEY_VERSION, "Hi"));
+ dacMap.put(NAME2, new DummyAuthorativeConcept(NAME2, "1.2.3", "Howdy"));
List<Map<String, DummyAuthorativeConcept>> authorativeList = new ArrayList<>();
authorativeList.add(dacMap);
List<Map<String, DummyAuthorativeConcept>> outMapList = container.toAuthorative();
- assertEquals(dacMap.get("name1"), outMapList.get(0).get("NULL"));
- assertEquals(dacMap.get("name0").getDescription(), outMapList.get(1).get("name0").getDescription());
- assertEquals(dacMap.get("name2"), outMapList.get(2).get("name2"));
+ assertEquals(dacMap.get(NAME1), outMapList.get(0).get("NULL"));
+ assertEquals(dacMap.get(NAME0).getDescription(), outMapList.get(1).get(NAME0).getDescription());
+ assertEquals(dacMap.get(NAME2), outMapList.get(2).get(NAME2));
DummyBadPfConceptContainer badContainer = new DummyBadPfConceptContainer();
- assertThatThrownBy(() -> {
- badContainer.fromAuthorative(authorativeList);
- }).hasMessage("failed to instantiate instance of container concept class");
+ assertThatThrownBy(() -> badContainer.fromAuthorative(authorativeList))
+ .hasMessage("failed to instantiate instance of container concept class");
authorativeList.clear();
- assertThatThrownBy(() -> {
- container.fromAuthorative(authorativeList);
- }).hasMessage("An incoming list of concepts must have at least one entry");
+ assertThatThrownBy(() -> container.fromAuthorative(authorativeList))
+ .hasMessage("An incoming list of concepts must have at least one entry");
}
@Test(expected = NullPointerException.class)
/*-
* ============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.
package org.onap.policy.models.base;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.util.NavigableMap;
import java.util.TreeMap;
import java.util.TreeSet;
-
import org.junit.Test;
/**
*/
public class PfConceptGetterImplTest {
+ private static final String VERSION002 = "0.0.2";
+ private static final String VERSION001 = "0.0.1";
+
@Test
public void testPfConceptGetterImpl() {
NavigableMap<PfConceptKey, PfConceptKey> keyMap = new TreeMap<>();
PfConceptGetterImpl<PfConceptKey> getter = new PfConceptGetterImpl<>(keyMap);
assertNotNull(getter);
- PfConceptKey keyA = new PfConceptKey("A", "0.0.1");
+ PfConceptKey keyA = new PfConceptKey("A", VERSION001);
assertNull(getter.get(keyA));
- try {
- getter.get((String)null);
- fail("test should throw an exception here");
- }
- catch (Exception getException) {
- assertEquals("conceptKeyName may not be null", getException.getMessage());
- }
+ assertThatThrownBy(() -> getter.get((String) null)).hasMessage("conceptKeyName may not be null");
assertNull(getter.get("W"));
- PfConceptKey keyZ = new PfConceptKey("Z", "0.0.1");
+ PfConceptKey keyZ = new PfConceptKey("Z", VERSION001);
keyMap.put(keyZ, keyZ);
assertNull(getter.get("W"));
- PfConceptKey keyW001 = new PfConceptKey("W", "0.0.1");
+ PfConceptKey keyW001 = new PfConceptKey("W", VERSION001);
keyMap.put(keyW001, keyW001);
assertEquals(keyW001, getter.get("W"));
- PfConceptKey keyW002 = new PfConceptKey("W", "0.0.2");
+ PfConceptKey keyW002 = new PfConceptKey("W", VERSION002);
keyMap.put(keyW002, keyW002);
assertEquals(keyW002, getter.get("W"));
keyMap.remove(keyZ);
assertEquals(keyW002, getter.get("W"));
- try {
- getter.get((String)null, "0.0.1");
- fail("test should throw an exception here");
- }
- catch (Exception getException) {
- assertEquals("conceptKeyName may not be null", getException.getMessage());
- }
+ assertThatThrownBy(() -> getter.get((String) null, VERSION001)).hasMessage("conceptKeyName may not be null");
- assertEquals(keyW002, getter.get("W", "0.0.2"));
+ assertEquals(keyW002, getter.get("W", VERSION002));
assertEquals(keyW002, getter.get("W", (String)null));
assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null));
assertEquals(new TreeSet<PfConceptKey>(keyMap.values()), getter.getAll(null, null));
assertEquals(keyW001, getter.getAll("W", null).iterator().next());
- assertEquals(keyW002, getter.getAll("W", "0.0.2").iterator().next());
+ assertEquals(keyW002, getter.getAll("W", VERSION002).iterator().next());
assertEquals(0, getter.getAll("A", null).size());
assertEquals(0, getter.getAll("Z", null).size());
keyMap.put(keyZ, keyZ);
- assertEquals(keyW002, getter.getAll("W", "0.0.2").iterator().next());
+ assertEquals(keyW002, getter.getAll("W", VERSION002).iterator().next());
}
}
/*-
* ============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.
package org.onap.policy.models.base;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.lang.reflect.Field;
-
import org.junit.Test;
-
import org.onap.policy.models.base.PfKey.Compatibility;
import org.onap.policy.models.base.testconcepts.DummyPfConcept;
import org.onap.policy.models.base.testconcepts.DummyPfKey;
public class PfKeyTest {
+ private static final String OTHER_IS_NULL = "otherKey is marked @NonNull but is null";
+ private static final String ID_IS_NULL = "id is marked @NonNull but is null";
+ private static final String VERSION123 = "1.2.3";
+ private static final String VERSION100 = "1.0.0";
+ private static final String VERSION001 = "0.0.1";
+
@Test
public void testConceptKey() {
- try {
- new PfConceptKey("some bad key id");
- fail("This test should throw an exception");
- } catch (IllegalArgumentException e) {
- assertEquals(
- "parameter \"id\": value \"some bad key id\", "
- + "does not match regular expression \"" + PfKey.KEY_ID_REGEXP + "\"",
- e.getMessage());
- }
-
- try {
- new PfConceptKey((PfConceptKey) null);
- fail("This test should throw an exception");
- } catch (Exception e) {
- assertEquals("copyConcept is marked @NonNull but is null", e.getMessage());
- }
+ assertThatIllegalArgumentException().isThrownBy(() -> new PfConceptKey("some bad key id"))
+ .withMessage("parameter \"id\": value \"some bad key id\", "
+ + "does not match regular expression \"" + PfKey.KEY_ID_REGEXP + "\"");
+
+ assertThatThrownBy(() -> new PfConceptKey((PfConceptKey) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
PfConceptKey someKey0 = new PfConceptKey();
assertEquals(PfConceptKey.getNullKey(), someKey0);
- PfConceptKey someKey1 = new PfConceptKey("name", "0.0.1");
+ PfConceptKey someKey1 = new PfConceptKey("name", VERSION001);
PfConceptKey someKey2 = new PfConceptKey(someKey1);
PfConceptKey someKey3 = new PfConceptKey(someKey1.getId());
assertEquals(someKey1, someKey2);
assertTrue(PfConceptKey.getNullKey().isNullKey());
- try {
- PfConceptKey.getNullKey().matchesId(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("id is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> PfConceptKey.getNullKey().matchesId(null)).hasMessage(ID_IS_NULL);
assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(new DummyPfKey()));
assertEquals(Compatibility.DIFFERENT, someKey0.getCompatibility(someKey1));
assertEquals(0, someKey7.compareTo(someKey1));
assertEquals(-12, someKey7.compareTo(someKey0));
- try {
- someKey0.compareTo(null);
- fail("test should throw an exception here");
- } catch (NullPointerException e) {
- assertEquals("otherObj is marked @NonNull but is null", e.getMessage());
- }
+ assertThatThrownBy(() -> someKey0.compareTo(null)).isInstanceOf(NullPointerException.class)
+ .hasMessage("otherObj is marked @NonNull but is null");
assertEquals(0, someKey0.compareTo(someKey0));
assertEquals(266127751, someKey0.compareTo(new DummyPfKey()));
assertFalse(someKey0.equals(null));
assertTrue(someKey0.equals(someKey0));
- assertFalse(((PfKey) someKey0).equals(new DummyPfKey()));
+ assertFalse(someKey0.equals(new DummyPfKey()));
}
@Test
public void testNullArguments() {
- try {
- new PfConceptKey((String) null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("id is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new PfConceptKey((PfConceptKey) null);
- fail("id is marked @NonNull but is null");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new PfConceptKey(null, null);
- fail("id is marked @NonNull but is null");
- } catch (Exception exc) {
- assertEquals("name is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new PfConceptKey("name", null);
- fail("id is marked @NonNull but is null");
- } catch (Exception exc) {
- assertEquals("version is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new PfConceptKey(null, "0.0.1");
- fail("id is marked @NonNull but is null");
- } catch (Exception exc) {
- assertEquals("name is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- PfConceptKey key = new PfConceptKey("AKey", "0.0.1");
- key.isCompatible(null);
- fail("id is marked @NonNull but is null");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new PfConceptKey((String) null)).hasMessage(ID_IS_NULL);
+
+ assertThatThrownBy(() -> new PfConceptKey((PfConceptKey) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new PfConceptKey(null, null)).hasMessage("name is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new PfConceptKey("name", null)).hasMessage("version is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new PfConceptKey(null, VERSION001)).hasMessage("name is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new PfConceptKey("AKey", VERSION001).isCompatible(null)).hasMessage(OTHER_IS_NULL);
}
@Test
- public void testValidation() {
- PfConceptKey testKey = new PfConceptKey("TheKey", "0.0.1");
+ public void testValidation() throws Exception {
+ PfConceptKey testKey = new PfConceptKey("TheKey", VERSION001);
assertEquals("TheKey:0.0.1", testKey.getId());
- try {
- Field nameField = testKey.getClass().getDeclaredField("name");
- nameField.setAccessible(true);
- nameField.set(testKey, "Key Name");
- PfValidationResult validationResult = new PfValidationResult();
- testKey.validate(validationResult);
- nameField.set(testKey, "TheKey");
- nameField.setAccessible(false);
- assertEquals(
- "name invalid-parameter name with value Key Name "
- + "does not match regular expression " + PfKey.NAME_REGEXP,
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
-
- try {
- Field versionField = testKey.getClass().getDeclaredField("version");
- versionField.setAccessible(true);
- versionField.set(testKey, "Key Version");
- PfValidationResult validationResult = new PfValidationResult();
- testKey.validate(validationResult);
- versionField.set(testKey, "0.0.1");
- versionField.setAccessible(false);
- assertEquals(
- "version invalid-parameter version with value Key Version "
- + "does not match regular expression " + PfKey.VERSION_REGEXP,
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
+ Field nameField = testKey.getClass().getDeclaredField("name");
+ nameField.setAccessible(true);
+ nameField.set(testKey, "Key Name");
+ PfValidationResult validationResult = new PfValidationResult();
+ testKey.validate(validationResult);
+ nameField.set(testKey, "TheKey");
+ nameField.setAccessible(false);
+ assertEquals(
+ "name invalid-parameter name with value Key Name "
+ + "does not match regular expression " + PfKey.NAME_REGEXP,
+ validationResult.getMessageList().get(0).getMessage());
+
+ Field versionField = testKey.getClass().getDeclaredField("version");
+ versionField.setAccessible(true);
+ versionField.set(testKey, "Key Version");
+ PfValidationResult validationResult2 = new PfValidationResult();
+ testKey.validate(validationResult2);
+ versionField.set(testKey, VERSION001);
+ versionField.setAccessible(false);
+ assertEquals(
+ "version invalid-parameter version with value Key Version "
+ + "does not match regular expression " + PfKey.VERSION_REGEXP,
+ validationResult2.getMessageList().get(0).getMessage());
}
@Test
public void testkeynewerThan() {
- PfConceptKey key1 = new PfConceptKey("Key1", "1.2.3");
-
- try {
- key1.isNewerThan(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- key1.isNewerThan(new PfReferenceKey());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("org.onap.policy.models.base.PfReferenceKey is not "
- + "an instance of org.onap.policy.models.base.PfConceptKey", exc.getMessage());
- }
+ PfConceptKey key1 = new PfConceptKey("Key1", VERSION123);
+
+ assertThatThrownBy(() -> key1.isNewerThan(null)).hasMessage(OTHER_IS_NULL);
+
+ assertThatThrownBy(() -> key1.isNewerThan(new PfReferenceKey()))
+ .hasMessage("org.onap.policy.models.base.PfReferenceKey is not "
+ + "an instance of org.onap.policy.models.base.PfConceptKey");
assertFalse(key1.isNewerThan(key1));
- PfConceptKey key1a = new PfConceptKey("Key1a", "1.2.3");
+ PfConceptKey key1a = new PfConceptKey("Key1a", VERSION123);
assertFalse(key1.isNewerThan(key1a));
- PfConceptKey key1b = new PfConceptKey("Key0", "1.2.3");
+ PfConceptKey key1b = new PfConceptKey("Key0", VERSION123);
assertTrue(key1.isNewerThan(key1b));
key1a.setName("Key1");
assertTrue(key1.isNewerThan(key1a));
key1a.setVersion("2.2.3");
assertFalse(key1.isNewerThan(key1a));
- key1a.setVersion("1.2.3");
+ key1a.setVersion(VERSION123);
assertFalse(key1.isNewerThan(key1a));
key1a.setVersion("1.1.3");
assertTrue(key1.isNewerThan(key1a));
key1a.setVersion("1.3.3");
assertFalse(key1.isNewerThan(key1a));
- key1a.setVersion("1.2.3");
+ key1a.setVersion(VERSION123);
assertFalse(key1.isNewerThan(key1a));
key1a.setVersion("1.2.2");
assertTrue(key1.isNewerThan(key1a));
key1a.setVersion("1.2.4");
assertFalse(key1.isNewerThan(key1a));
- key1a.setVersion("1.2.3");
+ key1a.setVersion(VERSION123);
assertFalse(key1.isNewerThan(key1a));
- key1.setVersion("1.0.0");
+ key1.setVersion(VERSION100);
assertFalse(key1.isNewerThan(key1a));
- key1a.setVersion("1.0.0");
+ key1a.setVersion(VERSION100);
assertFalse(key1.isNewerThan(key1a));
PfReferenceKey refKey = new PfReferenceKey();
- try {
- refKey.isNewerThan(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- refKey.isNewerThan(new PfConceptKey());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("org.onap.policy.models.base.PfConceptKey is not "
- + "an instance of org.onap.policy.models.base.PfReferenceKey", exc.getMessage());
- }
+ assertThatThrownBy(() -> refKey.isNewerThan(null)).hasMessage(OTHER_IS_NULL);
+
+ assertThatThrownBy(() -> refKey.isNewerThan(new PfConceptKey()))
+ .hasMessage("org.onap.policy.models.base.PfConceptKey is not "
+ + "an instance of org.onap.policy.models.base.PfReferenceKey");
assertFalse(refKey.isNewerThan(refKey));
}
@Test
public void testmajorMinorPatch() {
- PfConceptKey key = new PfConceptKey("Key", "1.0.0");
+ PfConceptKey key = new PfConceptKey("Key", VERSION100);
assertEquals(1, key.getMajorVersion());
assertEquals(0, key.getMinorVersion());
assertEquals(0, key.getPatchVersion());
assertEquals(2, key.getMinorVersion());
assertEquals(0, key.getPatchVersion());
- key = new PfConceptKey("Key", "1.2.3");
+ key = new PfConceptKey("Key", VERSION123);
assertEquals(1, key.getMajorVersion());
assertEquals(2, key.getMinorVersion());
assertEquals(3, key.getPatchVersion());
/*-
* ============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.
package org.onap.policy.models.base;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Test;
import org.onap.policy.models.base.PfKey.Compatibility;
public class PfKeyUseTest {
- @SuppressWarnings("unlikely-arg-type")
+ private static final String OTHER_KEY_IS_NULL = "otherKey is marked @NonNull but is null";
+
@Test
public void testKeyUse() {
assertNotNull(new PfKeyUse());
assertNotNull(new PfKeyUse(new PfConceptKey()));
assertNotNull(new PfKeyUse(new PfReferenceKey()));
- try {
- new PfKeyUse((PfKeyUse) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new PfKeyUse((PfKeyUse) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
PfConceptKey key = new PfConceptKey("Key", "0.0.1");
PfKeyUse keyUse = new PfKeyUse();
assertEquals(Compatibility.IDENTICAL, keyUse.getCompatibility(key));
- try {
- key.getCompatibility(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> key.getCompatibility(null)).hasMessage(OTHER_KEY_IS_NULL);
assertTrue(keyUse.isCompatible(key));
PfValidationResult resultNull = new PfValidationResult();
assertEquals(false, keyUseNull.validate(resultNull).isValid());
- try {
- keyUse.setKey(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- keyUse.getCompatibility(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- keyUse.isCompatible(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- keyUse.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("result is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> keyUse.setKey(null)).hasMessage("key is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> keyUse.getCompatibility(null)).hasMessage(OTHER_KEY_IS_NULL);
+
+ assertThatThrownBy(() -> keyUse.isCompatible(null)).hasMessage(OTHER_KEY_IS_NULL);
+
+ assertThatThrownBy(() -> keyUse.validate(null)).hasMessage("result is marked @NonNull but is null");
PfKeyUse testKeyUse = new PfKeyUse(new DummyPfConceptKeySub(new PfConceptKey()));
PfKeyUse targetKeyUse = new PfKeyUse(key);
- try {
- keyUse.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> keyUse.copyTo(null)).hasMessage("target is marked @NonNull but is null");
- try {
+ assertThatThrownBy(() -> {
testKeyUse.copyTo(targetKeyUse);
keyUse.isCompatible(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("error copying concept key: Some error message", exc.getMessage());
- }
-
- try {
- keyUse.isNewerThan(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
+ }).hasMessage("error copying concept key: Some error message");
+
+ assertThatThrownBy(() -> keyUse.isNewerThan(null)).hasMessage(OTHER_KEY_IS_NULL);
assertEquals(false, testKeyUse.isNewerThan(keyUse));
assertEquals(false, testKeyUse.isNewerThan(testKeyUse));
-package org.onap.policy.models.base;
/*-
* ============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.
* ============LICENSE_END=========================================================
*/
+package org.onap.policy.models.base;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Test;
import org.onap.policy.models.base.testconcepts.DummyPfModel;
*/
public class PfModelTest {
+ private static final String VERSION001 = "0.0.1";
+
@Test
public void testPfModel() {
assertNotNull(new DummyPfModel());
assertNotNull(new DummyPfModel(new PfConceptKey()));
assertNotNull(new DummyPfModel(new DummyPfModel()));
- try {
- new DummyPfModel((PfConceptKey)null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- DummyPfModel nullModel = null;
- new DummyPfModel(nullModel);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- DummyPfModel dpm = new DummyPfModel(new PfConceptKey("modelKey", "0.0.1"));
+ assertThatThrownBy(() -> new DummyPfModel((PfConceptKey) null))
+ .hasMessage("key is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new DummyPfModel((DummyPfModel) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ DummyPfModel dpm = new DummyPfModel(new PfConceptKey("modelKey", VERSION001));
DummyPfModel dpmClone = new DummyPfModel(dpm);
assertEquals(dpm, dpmClone);
dpmClone.clean();
assertEquals(dpm, dpmClone);
- try {
- dpm.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> dpm.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(0, dpm.compareTo(dpmClone));
assertEquals(-1, dpm.compareTo(null));
@Test
public void testPfModelValidation() {
- PfConceptKey dpmKey = new PfConceptKey("modelKey", "0.0.1");
+ PfConceptKey dpmKey = new PfConceptKey("modelKey", VERSION001);
DummyPfModel dpm = new DummyPfModel(dpmKey);
assertTrue(dpm.validate(new PfValidationResult()).isValid());
- try {
- dpm.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> dpm.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
dpm.setKey(PfConceptKey.getNullKey());
assertFalse(dpm.validate(new PfValidationResult()).isValid());
dpm.getKeyList().clear();
assertTrue(dpm.validate(new PfValidationResult()).isValid());
- PfConceptKey goodCKey = new PfConceptKey("goodCKey", "0.0.1");
+ PfConceptKey goodCKey = new PfConceptKey("goodCKey", VERSION001);
PfReferenceKey goodRKey = new PfReferenceKey(goodCKey, "goodLocalName");
dpm.getKeyList().add(goodCKey);
dpm.getKeyList().add(goodRKeyUse);
assertTrue(dpm.validate(new PfValidationResult()).isValid());
- PfConceptKey badCKey = new PfConceptKey("badCKey", "0.0.1");
+ PfConceptKey badCKey = new PfConceptKey("badCKey", VERSION001);
PfKeyUse badCKeyUse = new PfKeyUse(badCKey);
dpm.getKeyList().add(badCKeyUse);
assertFalse(dpm.validate(new PfValidationResult()).isValid());
*/
public class PfObjectFilterTest {
+ private static final String NAME1 = "name1";
+ private static final String NAME0 = "name0";
+ private static final String HELLO = "Hello";
+ private static final String DESCRIPTION1 = "Desc 1";
+ private static final String VERSION100 = "1.0.0";
+ private static final String VERSION002 = "0.0.2";
+
@Test
public void testPfObjectInterface() {
DummyPfObject do0 = new DummyPfObject();
- do0.setName("name0");
- do0.setVersion("1.0.0");
+ do0.setName(NAME0);
+ do0.setVersion(VERSION100);
do0.setDescription("desc0 ");
DummyPfObject do1 = new DummyPfObject();
- do1.setName("name0");
+ do1.setName(NAME0);
do1.setVersion("0.0.1");
- do1.setDescription("Desc 1");
+ do1.setDescription(DESCRIPTION1);
DummyPfObject do2 = new DummyPfObject();
- do2.setName("name0");
- do2.setVersion("0.0.2");
- do2.setDescription("Desc 1");
+ do2.setName(NAME0);
+ do2.setVersion(VERSION002);
+ do2.setDescription(DESCRIPTION1);
DummyPfObject do3 = new DummyPfObject();
- do3.setName("name1");
+ do3.setName(NAME1);
do3.setVersion("0.0.1");
do3.setDescription("desc0 ");
DummyPfObject do4 = new DummyPfObject();
- do4.setName("name1");
+ do4.setName(NAME1);
do4.setVersion("0.1.2");
- do4.setDescription("Desc 1");
+ do4.setDescription(DESCRIPTION1);
DummyPfObject do5 = new DummyPfObject();
do5.setName("aaaaa");
- do5.setVersion("0.0.2");
- do5.setDescription("Desc 1");
+ do5.setVersion(VERSION002);
+ do5.setDescription(DESCRIPTION1);
List<DummyPfObject> doList = new ArrayList<>();
doList.add(do0);
doList.add(do5);
DummyPfObjectFilter dof = new DummyPfObjectFilter();
- assertFalse(dof.filterString("Hello", "Goodbye"));
- assertTrue(dof.filterString("Hello", "Hello"));
+ assertFalse(dof.filterString(HELLO, "Goodbye"));
+ assertTrue(dof.filterString(HELLO, HELLO));
- assertEquals(false, dof.filterString("Hello", "Goodbye"));
- assertEquals(true, dof.filterString("Hello", "Hello"));
- assertEquals(true, dof.filterString("Hello", null));
+ assertEquals(false, dof.filterString(HELLO, "Goodbye"));
+ assertEquals(true, dof.filterString(HELLO, HELLO));
+ assertEquals(true, dof.filterString(HELLO, null));
List<DummyPfObject> latestVersionList = dof.latestVersionFilter(doList);
assertEquals(3, latestVersionList.size());
assertEquals("aaaaa", latestVersionList.get(0).getName());
- assertEquals("0.0.2", latestVersionList.get(0).getVersion());
- assertEquals("name0", latestVersionList.get(1).getName());
- assertEquals("1.0.0", latestVersionList.get(1).getVersion());
- assertEquals("name1", latestVersionList.get(2).getName());
+ assertEquals(VERSION002, latestVersionList.get(0).getVersion());
+ assertEquals(NAME0, latestVersionList.get(1).getName());
+ assertEquals(VERSION100, latestVersionList.get(1).getVersion());
+ assertEquals(NAME1, latestVersionList.get(2).getName());
assertEquals("0.1.2", latestVersionList.get(2).getVersion());
latestVersionList.remove(2);
MyFilter filter = new MyFilter();
- assertEquals(true, filter.filterString(null, "Hello"));
+ assertEquals(true, filter.filterString(null, HELLO));
DummyPfObject doNullVersion = new DummyPfObject();
do5.setName("bbbbb");
- assertEquals(false, filter(filter::filterStringPred, DummyPfObject::getVersion, doNullVersion, "1.0.0"));
+ assertEquals(false, filter(filter::filterStringPred, DummyPfObject::getVersion, doNullVersion, VERSION100));
assertEquals(false, filter(filter::filterStringPred, DummyPfObject::getVersion, do0, "1"));
assertEquals(false, filter(filter::filterStringPred, DummyPfObject::getVersion, do0, "2.0.0"));
assertEquals(true, filter(filter::filterStringPred, DummyPfObject::getVersion, doNullVersion, null));
assertEquals(true, filter(filter::filterStringPred, DummyPfObject::getVersion, do0, null));
- assertEquals(true, filter(filter::filterStringPred, DummyPfObject::getVersion, do0, "1.0.0"));
+ assertEquals(true, filter(filter::filterStringPred, DummyPfObject::getVersion, do0, VERSION100));
assertEquals(false, filter(filter::filterPrefixPred, DummyPfObject::getVersion, doNullVersion, "1."));
assertEquals(false, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, "1.1"));
assertEquals(true, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, null));
assertEquals(true, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, "1."));
assertEquals(true, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, "1.0."));
- assertEquals(true, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, "1.0.0"));
+ assertEquals(true, filter(filter::filterPrefixPred, DummyPfObject::getVersion, do0, VERSION100));
assertEquals(false, filter(filter::filterRegexpPred, DummyPfObject::getVersion, doNullVersion, "1[.].*"));
assertEquals(false, filter(filter::filterRegexpPred, DummyPfObject::getVersion, do0, "2[.].*"));
/*-
* ============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.
package org.onap.policy.models.base;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.lang.reflect.Field;
-
import org.junit.Test;
public class PfReferenceKeyTest {
+ private static final String PARENT_LOCAL_NAME = "ParentLocalName";
+ private static final String NPKLN = "NPKLN";
+ private static final String LOCAL_NAME = "LocalName";
+ private static final String VERSION002 = "0.0.2";
+ private static final String VERSION001 = "0.0.1";
+
@Test
public void testPfReferenceKey() {
assertNotNull(new PfReferenceKey());
assertNotNull(new PfReferenceKey(new PfConceptKey()));
- assertNotNull(new PfReferenceKey(new PfConceptKey(), "LocalName"));
+ assertNotNull(new PfReferenceKey(new PfConceptKey(), LOCAL_NAME));
assertNotNull(new PfReferenceKey(new PfReferenceKey()));
- assertNotNull(new PfReferenceKey(new PfReferenceKey(), "LocalName"));
- assertNotNull(new PfReferenceKey(new PfConceptKey(), "ParentLocalName", "LocalName"));
- assertNotNull(new PfReferenceKey("ParentKeyName", "0.0.1", "LocalName"));
- assertNotNull(new PfReferenceKey("ParentKeyName", "0.0.1", "ParentLocalName", "LocalName"));
+ assertNotNull(new PfReferenceKey(new PfReferenceKey(), LOCAL_NAME));
+ assertNotNull(new PfReferenceKey(new PfConceptKey(), PARENT_LOCAL_NAME, LOCAL_NAME));
+ assertNotNull(new PfReferenceKey("ParentKeyName", VERSION001, LOCAL_NAME));
+ assertNotNull(new PfReferenceKey("ParentKeyName", VERSION001, PARENT_LOCAL_NAME, LOCAL_NAME));
assertNotNull(new PfReferenceKey("ParentKeyName:0.0.1:ParentLocalName:LocalName"));
assertEquals(PfReferenceKey.getNullKey().getKey(), PfReferenceKey.getNullKey());
assertEquals("NULL:0.0.0:NULL:NULL", PfReferenceKey.getNullKey().getId());
- try {
- new PfReferenceKey(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("parameter \"localName\" is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new PfReferenceKey(new PfConceptKey(), null))
+ .hasMessage("parameter \"localName\" is null");
PfReferenceKey testReferenceKey = new PfReferenceKey();
- testReferenceKey.setParentConceptKey(new PfConceptKey("PN", "0.0.1"));
+ testReferenceKey.setParentConceptKey(new PfConceptKey("PN", VERSION001));
assertEquals("PN:0.0.1", testReferenceKey.getParentConceptKey().getId());
assertEquals(0, testReferenceKey.getMajorVersion());
assertEquals(1, testReferenceKey.getKeys().size());
assertFalse(testReferenceKey.isNullKey());
- testReferenceKey.setParentReferenceKey(new PfReferenceKey("PN", "0.0.1", "LN"));
+ testReferenceKey.setParentReferenceKey(new PfReferenceKey("PN", VERSION001, "LN"));
assertEquals("PN:0.0.1:NULL:LN", testReferenceKey.getParentReferenceKey().getId());
testReferenceKey.setParentKeyName("NPKN");
assertEquals("NPKN", testReferenceKey.getParentKeyName());
- testReferenceKey.setParentKeyVersion("0.0.1");
- assertEquals("0.0.1", testReferenceKey.getParentKeyVersion());
+ testReferenceKey.setParentKeyVersion(VERSION001);
+ assertEquals(VERSION001, testReferenceKey.getParentKeyVersion());
- testReferenceKey.setParentLocalName("NPKLN");
- assertEquals("NPKLN", testReferenceKey.getParentLocalName());
+ testReferenceKey.setParentLocalName(NPKLN);
+ assertEquals(NPKLN, testReferenceKey.getParentLocalName());
testReferenceKey.setLocalName("NLN");
assertEquals("NLN", testReferenceKey.getLocalName());
- try {
- testReferenceKey.isCompatible(null);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("otherKey is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> testReferenceKey.isCompatible(null))
+ .hasMessage("otherKey is marked @NonNull but is null");
assertFalse(testReferenceKey.isCompatible(PfConceptKey.getNullKey()));
assertFalse(testReferenceKey.isCompatible(PfReferenceKey.getNullKey()));
assertTrue(testReferenceKey.equals(testReferenceKey));
assertTrue(testReferenceKey.equals(clonedReferenceKey));
assertFalse(testReferenceKey.equals("Hello"));
- assertFalse(testReferenceKey.equals(new PfReferenceKey("PKN", "0.0.2", "PLN", "LN")));
- assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", "0.0.2", "PLN", "LN")));
- assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", "0.0.1", "PLN", "LN")));
- assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", "0.0.1", "NPLN", "LN")));
- assertTrue(testReferenceKey.equals(new PfReferenceKey("NPKN", "0.0.1", "NPKLN", "NLN")));
+ assertFalse(testReferenceKey.equals(new PfReferenceKey("PKN", VERSION002, "PLN", "LN")));
+ assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", VERSION002, "PLN", "LN")));
+ assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", VERSION001, "PLN", "LN")));
+ assertFalse(testReferenceKey.equals(new PfReferenceKey("NPKN", VERSION001, "NPLN", "LN")));
+ assertTrue(testReferenceKey.equals(new PfReferenceKey("NPKN", VERSION001, NPKLN, "NLN")));
assertEquals(0, testReferenceKey.compareTo(testReferenceKey));
assertEquals(0, testReferenceKey.compareTo(clonedReferenceKey));
assertNotEquals(0, testReferenceKey.compareTo(new PfConceptKey()));
- assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("PKN", "0.0.2", "PLN", "LN")));
- assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", "0.0.2", "PLN", "LN")));
- assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", "0.0.1", "PLN", "LN")));
- assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", "0.0.1", "NPLN", "LN")));
- assertEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", "0.0.1", "NPKLN", "NLN")));
+ assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("PKN", VERSION002, "PLN", "LN")));
+ assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION002, "PLN", "LN")));
+ assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION001, "PLN", "LN")));
+ assertNotEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION001, "NPLN", "LN")));
+ assertEquals(0, testReferenceKey.compareTo(new PfReferenceKey("NPKN", VERSION001, NPKLN, "NLN")));
assertFalse(testReferenceKey.equals(null));
- try {
- testReferenceKey.copyTo(null);
- fail("test should throw an exception here");
- } catch (Exception iae) {
- assertEquals("target may not be null", iae.getMessage());
- }
-
- try {
- testReferenceKey.copyTo(new PfConceptKey("Key", "0.0.1"));
- fail("test should throw an exception here");
- } catch (Exception iae) {
- assertEquals("org.onap.policy.models.base.PfConceptKey"
- + " is not an instance of org.onap.policy.models.base.PfReferenceKey", iae.getMessage());
- }
+ assertThatThrownBy(() -> testReferenceKey.copyTo(null)).hasMessage("target may not be null");
+
+ assertThatThrownBy(() -> testReferenceKey.copyTo(new PfConceptKey("Key", VERSION001)))
+ .hasMessage("org.onap.policy.models.base.PfConceptKey"
+ + " is not an instance of org.onap.policy.models.base.PfReferenceKey");
PfReferenceKey targetRefKey = new PfReferenceKey();
assertEquals(testReferenceKey, testReferenceKey.copyTo(targetRefKey));
}
@Test
- public void testValidation() {
+ public void testValidation() throws Exception {
PfReferenceKey testReferenceKey = new PfReferenceKey();
- testReferenceKey.setParentConceptKey(new PfConceptKey("PN", "0.0.1"));
+ testReferenceKey.setParentConceptKey(new PfConceptKey("PN", VERSION001));
assertEquals("PN:0.0.1", testReferenceKey.getParentConceptKey().getId());
- try {
- Field parentNameField = testReferenceKey.getClass().getDeclaredField("parentKeyName");
- parentNameField.setAccessible(true);
- parentNameField.set(testReferenceKey, "Parent Name");
- PfValidationResult validationResult = new PfValidationResult();
- testReferenceKey.validate(validationResult);
- parentNameField.set(testReferenceKey, "ParentName");
- parentNameField.setAccessible(false);
- assertEquals(
- "parentKeyName invalid-parameter parentKeyName with value Parent Name "
- + "does not match regular expression " + PfKey.NAME_REGEXP,
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
-
- try {
- Field parentVersionField = testReferenceKey.getClass().getDeclaredField("parentKeyVersion");
- parentVersionField.setAccessible(true);
- parentVersionField.set(testReferenceKey, "Parent Version");
- PfValidationResult validationResult = new PfValidationResult();
- testReferenceKey.validate(validationResult);
- parentVersionField.set(testReferenceKey, "0.0.1");
- parentVersionField.setAccessible(false);
- assertEquals(
- "parentKeyVersion invalid-parameter parentKeyVersion with value Parent Version "
- + "does not match regular expression " + PfKey.VERSION_REGEXP,
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
-
- try {
- Field parentLocalNameField = testReferenceKey.getClass().getDeclaredField("parentLocalName");
- parentLocalNameField.setAccessible(true);
- parentLocalNameField.set(testReferenceKey, "Parent Local Name");
- PfValidationResult validationResult = new PfValidationResult();
- testReferenceKey.validate(validationResult);
- parentLocalNameField.set(testReferenceKey, "ParentLocalName");
- parentLocalNameField.setAccessible(false);
- assertEquals(
- "parentLocalName invalid-parameter parentLocalName with value "
- + "Parent Local Name does not match regular expression [A-Za-z0-9\\-_\\.]+|^$",
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
-
- try {
- Field localNameField = testReferenceKey.getClass().getDeclaredField("localName");
- localNameField.setAccessible(true);
- localNameField.set(testReferenceKey, "Local Name");
- PfValidationResult validationResult = new PfValidationResult();
- testReferenceKey.validate(validationResult);
- localNameField.set(testReferenceKey, "LocalName");
- localNameField.setAccessible(false);
- assertEquals(
- "localName invalid-parameter localName with value Local Name "
- + "does not match regular expression [A-Za-z0-9\\-_\\.]+|^$",
- validationResult.getMessageList().get(0).getMessage());
- } catch (Exception validationException) {
- fail("test should not throw an exception");
- }
+ Field parentNameField = testReferenceKey.getClass().getDeclaredField("parentKeyName");
+ parentNameField.setAccessible(true);
+ parentNameField.set(testReferenceKey, "Parent Name");
+ PfValidationResult validationResult = new PfValidationResult();
+ testReferenceKey.validate(validationResult);
+ parentNameField.set(testReferenceKey, "ParentName");
+ parentNameField.setAccessible(false);
+ assertEquals(
+ "parentKeyName invalid-parameter parentKeyName with value Parent Name "
+ + "does not match regular expression " + PfKey.NAME_REGEXP,
+ validationResult.getMessageList().get(0).getMessage());
+
+ Field parentVersionField = testReferenceKey.getClass().getDeclaredField("parentKeyVersion");
+ parentVersionField.setAccessible(true);
+ parentVersionField.set(testReferenceKey, "Parent Version");
+ PfValidationResult validationResult2 = new PfValidationResult();
+ testReferenceKey.validate(validationResult2);
+ parentVersionField.set(testReferenceKey, VERSION001);
+ parentVersionField.setAccessible(false);
+ assertEquals(
+ "parentKeyVersion invalid-parameter parentKeyVersion with value Parent Version "
+ + "does not match regular expression " + PfKey.VERSION_REGEXP,
+ validationResult2.getMessageList().get(0).getMessage());
+
+ Field parentLocalNameField = testReferenceKey.getClass().getDeclaredField("parentLocalName");
+ parentLocalNameField.setAccessible(true);
+ parentLocalNameField.set(testReferenceKey, "Parent Local Name");
+ PfValidationResult validationResult3 = new PfValidationResult();
+ testReferenceKey.validate(validationResult3);
+ parentLocalNameField.set(testReferenceKey, PARENT_LOCAL_NAME);
+ parentLocalNameField.setAccessible(false);
+ assertEquals(
+ "parentLocalName invalid-parameter parentLocalName with value "
+ + "Parent Local Name does not match regular expression [A-Za-z0-9\\-_\\.]+|^$",
+ validationResult3.getMessageList().get(0).getMessage());
+
+ Field localNameField = testReferenceKey.getClass().getDeclaredField("localName");
+ localNameField.setAccessible(true);
+ localNameField.set(testReferenceKey, "Local Name");
+ PfValidationResult validationResult4 = new PfValidationResult();
+ testReferenceKey.validate(validationResult4);
+ localNameField.set(testReferenceKey, LOCAL_NAME);
+ localNameField.setAccessible(false);
+ assertEquals(
+ "localName invalid-parameter localName with value Local Name "
+ + "does not match regular expression [A-Za-z0-9\\-_\\.]+|^$",
+ validationResult4.getMessageList().get(0).getMessage());
}
}
*/
public class PfUtilsTest {
+ private static final String HELLO = "hello";
+
@Test
public void testCompareObjects() {
assertEquals(0, PfUtils.compareObjects(null, null));
- assertEquals(-1, PfUtils.compareObjects("hello", null));
- assertEquals(1, PfUtils.compareObjects(null, "hello"));
- assertFalse(PfUtils.compareObjects("hello", "goodbye") == 0);
- assertEquals(0, PfUtils.compareObjects("hello", "hello"));
+ assertEquals(-1, PfUtils.compareObjects(HELLO, null));
+ assertEquals(1, PfUtils.compareObjects(null, HELLO));
+ assertFalse(PfUtils.compareObjects(HELLO, "goodbye") == 0);
+ assertEquals(0, PfUtils.compareObjects(HELLO, HELLO));
}
@Test
* ONAP Policy Models
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * 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.
import org.junit.Test;
public class ValidatedTest {
+ private static final String COLLECTION_TEXT = "collection";
private static final String ERROR_MESSAGE = "error message";
private static final String COLLECTION_FIELD = "coll";
private static final String VALID_VALUE = "abc123";
@Test
public void testValidateCollectionNotNull() {
PfValidationResult result = new PfValidationResult();
- result = validated.validateCollectionNotNull(this, "collection", null, result);
+ result = validated.validateCollectionNotNull(this, COLLECTION_TEXT, null, result);
assertTrue(result.isValid());
assertEquals(0, result.getMessageList().size());
@Test
public void testValidateCollection() {
PfValidationResult result = new PfValidationResult();
- result = validated.validateCollection(this, "collection", null, result);
+ result = validated.validateCollection(this, COLLECTION_TEXT, null, result);
assertTrue(result.isValid());
assertEquals(0, result.getMessageList().size());
@Test
public void testValidateConceptCollection() {
PfValidationResult result = new PfValidationResult();
- result = validated.validateConceptCollection(this, "collection", null, result);
+ result = validated.validateConceptCollection(this, COLLECTION_TEXT, null, result);
assertTrue(result.isValid());
assertEquals(0, result.getMessageList().size());
/*-
* ============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.
public class ValidationTest {
+ private static final String HELLO = "hello";
+ private static final String SOME_MESSAGE = "Some message";
+
@Test
public void test() {
PfValidationResult result = new PfValidationResult();
assertNotNull(result.getMessageList());
PfValidationMessage vmess0 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
- ValidationResult.VALID, "Some message");
+ ValidationResult.VALID, SOME_MESSAGE);
result.addValidationMessage(vmess0);
assertTrue(result.isOk());
assertTrue(result.isValid());
assertEquals(PfValidationResult.ValidationResult.VALID, result.getValidationResult());
assertNotNull(result.getMessageList());
- assertNotNull("hello", result.toString());
+ assertNotNull(HELLO, result.toString());
PfValidationMessage vmess1 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
- ValidationResult.OBSERVATION, "Some message");
+ ValidationResult.OBSERVATION, SOME_MESSAGE);
result.addValidationMessage(vmess1);
assertTrue(result.isOk());
assertTrue(result.isValid());
assertEquals(PfValidationResult.ValidationResult.OBSERVATION, result.getValidationResult());
assertNotNull(result.getMessageList());
- assertNotNull("hello", result.toString());
+ assertNotNull(HELLO, result.toString());
PfValidationMessage vmess2 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
- ValidationResult.WARNING, "Some message");
+ ValidationResult.WARNING, SOME_MESSAGE);
result.addValidationMessage(vmess2);
assertFalse(result.isOk());
assertTrue(result.isValid());
assertEquals(PfValidationResult.ValidationResult.WARNING, result.getValidationResult());
assertNotNull(result.getMessageList());
- assertNotNull("hello", result.toString());
+ assertNotNull(HELLO, result.toString());
PfValidationMessage vmess3 = new PfValidationMessage(PfConceptKey.getNullKey(), PfConceptKey.class,
- ValidationResult.INVALID, "Some message");
+ ValidationResult.INVALID, SOME_MESSAGE);
result.addValidationMessage(vmess3);
assertFalse(result.isOk());
assertFalse(result.isValid());
assertEquals(PfValidationResult.ValidationResult.INVALID, result.getValidationResult());
assertNotNull(result.getMessageList());
- assertNotNull("hello", result.toString());
+ assertNotNull(HELLO, result.toString());
assertEquals(PfValidationResult.ValidationResult.INVALID, result.getMessageList().get(3).getValidationResult());
- assertEquals("Some message", result.getMessageList().get(3).getMessage());
+ assertEquals(SOME_MESSAGE, result.getMessageList().get(3).getMessage());
assertEquals(PfConceptKey.class.getCanonicalName(), result.getMessageList().get(3).getObservedClass());
assertEquals(PfConceptKey.getNullKey(), result.getMessageList().get(3).getObservedKey());
}
/*-
* ============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.
private String description;
- @Override
- public DummyAuthorativeConcept toAuthorative() {
- DummyAuthorativeConcept dac = new DummyAuthorativeConcept();
- dac.setName(key.getName());
- dac.setVersion(key.getVersion());
- dac.setDescription(description);
-
- return dac;
- }
-
- @Override
- public void fromAuthorative(DummyAuthorativeConcept dac) {
- key.setName(dac.getName());
- key.setVersion(dac.getVersion());
- description = dac.getDescription();
- }
-
/**
* The Default Constructor creates a {@link DummyPfConcept} object with a null key.
*/
super(copyConcept);
}
+ @Override
+ public DummyAuthorativeConcept toAuthorative() {
+ DummyAuthorativeConcept dac = new DummyAuthorativeConcept();
+ dac.setName(key.getName());
+ dac.setVersion(key.getVersion());
+ dac.setDescription(description);
+
+ return dac;
+ }
+
+ @Override
+ public void fromAuthorative(DummyAuthorativeConcept dac) {
+ key.setName(dac.getName());
+ key.setVersion(dac.getVersion());
+ description = dac.getDescription();
+ }
+
@Override
public List<PfKey> getKeys() {
- final List<PfKey> keyList = getKey().getKeys();
- return keyList;
+ return getKey().getKeys();
}
@Override
/*-
* ============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.
@Override
public void clean() {
-
+ // nothing to do
}
@Override
@Override
public String toString() {
- return null;
+ return "";
}
@Override
/*-
* ============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.
public DummyPfModel() {
super();
super.setKey(new PfConceptKey());
- this.keyList = new ArrayList<PfKey>();
+ this.keyList = new ArrayList<>();
}
/**
*/
public DummyPfModel(final PfConceptKey key) {
super(key);
- this.keyList = new ArrayList<PfKey>();
+ this.keyList = new ArrayList<>();
}
/**
@Override
public void register() {
+ // nothing to do
}
@Override
/*-
* ============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.
*/
@Data
public class DummyPfNameVersion implements PfNameVersion {
- public String name;
- public String version;
+ private String name;
+ private String version;
}
/*-
* ============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.
package org.onap.policy.models.dao;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.util.Properties;
-
import org.junit.Test;
-import org.onap.policy.models.dao.DaoParameters;
-import org.onap.policy.models.dao.PfDaoFactory;
import org.onap.policy.models.dao.converters.CDataConditioner;
import org.onap.policy.models.dao.converters.Uuid2String;
public class DaoMiscTest {
+ private static final String SOMEWHERE_OVER_THE_RAINBOW = "somewhere.over.the.rainbow";
+
@Test
public void testUuid2StringMopUp() {
final Uuid2String uuid2String = new Uuid2String();
public void testDaoFactory() {
final DaoParameters daoParameters = new DaoParameters();
- daoParameters.setPluginClass("somewhere.over.the.rainbow");
- try {
- new PfDaoFactory().createPfDao(daoParameters);
- fail("test shold throw an exception here");
- } catch (final Exception e) {
- assertEquals("Policy Framework DAO class not found for DAO plugin \"somewhere.over.the.rainbow\"",
- e.getMessage());
- }
+ daoParameters.setPluginClass(SOMEWHERE_OVER_THE_RAINBOW);
+ assertThatThrownBy(() -> new PfDaoFactory().createPfDao(daoParameters)).hasMessage(
+ "Policy Framework DAO class not found for DAO plugin \"somewhere.over.the.rainbow\"");
daoParameters.setPluginClass("java.lang.String");
- try {
- new PfDaoFactory().createPfDao(daoParameters);
- fail("test shold throw an exception here");
- } catch (final Exception e) {
- assertEquals("Specified DAO plugin class \"java.lang.String\" " + "does not implement the PfDao interface",
- e.getMessage());
- }
+ assertThatThrownBy(() -> new PfDaoFactory().createPfDao(daoParameters)).hasMessage(
+ "Specified DAO plugin class \"java.lang.String\" " + "does not implement the PfDao interface");
}
@Test
pars.setPersistenceUnit("Kansas");
assertEquals("Kansas", pars.getPersistenceUnit());
- pars.setPluginClass("somewhere.over.the.rainbow");
- assertEquals("somewhere.over.the.rainbow", pars.getPluginClass());
+ pars.setPluginClass(SOMEWHERE_OVER_THE_RAINBOW);
+ assertEquals(SOMEWHERE_OVER_THE_RAINBOW, pars.getPluginClass());
assertEquals("DAOParameters [pluginClass=somewhere.over.the.rainbow, "
+ "persistenceUnit=Kansas, jdbcProperties={name=Dorothy}]", pars.toString());
/*-
* ============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.
final DummyReferenceEntity other = (DummyReferenceEntity) otherObj;
- return new Double(doubleValue).compareTo(new Double(other.doubleValue));
+ return Double.compare(doubleValue, other.doubleValue);
}
}
/*-
* ============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.
package org.onap.policy.models.dao;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
-
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.base.PfReferenceKey;
-import org.onap.policy.models.dao.DaoParameters;
-import org.onap.policy.models.dao.PfDao;
-import org.onap.policy.models.dao.PfDaoFactory;
import org.onap.policy.models.dao.impl.DefaultPfDao;
/**
* JUnit test class.
*/
public class EntityTest {
+ private static final String DESCRIPTION2 = "key description 2";
+ private static final String DESCRIPTION1 = "key description 1";
+ private static final String DESCRIPTION0 = "key description 0";
+ private static final String ENTITY0 = "Entity0";
+ private static final String UUID2 = "00000000-0000-0000-0000-000000000002";
+ private static final String UUID1 = "00000000-0000-0000-0000-000000000001";
+ private static final String UUID0 = "00000000-0000-0000-0000-000000000000";
+ private static final String VERSION003 = "0.0.3";
+ private static final String VERSION002 = "0.0.2";
+ private static final String VERSION001 = "0.0.1";
private PfDao pfDao;
@Test
pfDao = new PfDaoFactory().createPfDao(daoParameters);
- try {
- pfDao.init(null);
- fail("Test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("Policy Framework persistence unit parameter not set", e.getMessage());
- }
+ assertThatThrownBy(() -> pfDao.init(null)).hasMessage("Policy Framework persistence unit parameter not set");
- try {
- pfDao.init(daoParameters);
- fail("Test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("Policy Framework persistence unit parameter not set", e.getMessage());
- }
+ assertThatThrownBy(() -> pfDao.init(daoParameters))
+ .hasMessage("Policy Framework persistence unit parameter not set");
daoParameters.setPluginClass("somewhere.over.the.rainbow");
daoParameters.setPersistenceUnit("Dorothy");
- try {
- pfDao.init(daoParameters);
- fail("Test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("Creation of Policy Framework persistence unit \"Dorothy\" failed", e.getMessage());
- }
- try {
- pfDao.create(new PfConceptKey());
- fail("Test should throw an exception here");
- } catch (final Exception e) {
- assertEquals("Policy Framework DAO has not been initialized", e.getMessage());
- }
+
+ assertThatThrownBy(() -> pfDao.init(daoParameters))
+ .hasMessage("Creation of Policy Framework persistence unit \"Dorothy\" failed");
+
+ assertThatThrownBy(() -> pfDao.create(new PfConceptKey()))
+ .hasMessage("Policy Framework DAO has not been initialized");
+
pfDao.close();
}
}
private void testAllOps() {
- final PfConceptKey aKey0 = new PfConceptKey("A-KEY0", "0.0.1");
- final PfConceptKey aKey1 = new PfConceptKey("A-KEY1", "0.0.1");
- final PfConceptKey aKey2 = new PfConceptKey("A-KEY2", "0.0.1");
+ final PfConceptKey aKey0 = new PfConceptKey("A-KEY0", VERSION001);
+ final PfConceptKey aKey1 = new PfConceptKey("A-KEY1", VERSION001);
+ final PfConceptKey aKey2 = new PfConceptKey("A-KEY2", VERSION001);
final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
- UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+ UUID.fromString(UUID0), DESCRIPTION0);
final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
- UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+ UUID.fromString(UUID1), DESCRIPTION1);
final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
- UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+ UUID.fromString(UUID2), DESCRIPTION2);
pfDao.create(keyInfo0);
assertTrue(keyInfoBack0.equals(keyInfoBack1));
final DummyConceptEntity keyInfoBack2 =
- pfDao.getConcept(DummyConceptEntity.class, new PfConceptKey("A-KEY3", "0.0.1"));
+ pfDao.getConcept(DummyConceptEntity.class, new PfConceptKey("A-KEY3", VERSION001));
assertNull(keyInfoBack2);
- final Set<DummyConceptEntity> keyInfoSetIn = new TreeSet<DummyConceptEntity>();
+ final Set<DummyConceptEntity> keyInfoSetIn = new TreeSet<>();
keyInfoSetIn.add(keyInfo1);
keyInfoSetIn.add(keyInfo2);
pfDao.createCollection(keyInfoSetIn);
- Set<DummyConceptEntity> keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ Set<DummyConceptEntity> keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
keyInfoSetIn.add(keyInfo0);
assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
pfDao.delete(keyInfo1);
keyInfoSetIn.remove(keyInfo1);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
pfDao.deleteCollection(keyInfoSetIn);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertEquals(0, keyInfoSetOut.size());
keyInfoSetIn.add(keyInfo0);
keyInfoSetIn.add(keyInfo1);
keyInfoSetIn.add(keyInfo0);
pfDao.createCollection(keyInfoSetIn);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
pfDao.delete(DummyConceptEntity.class, aKey0);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertEquals(2, keyInfoSetOut.size());
assertEquals(2, pfDao.size(DummyConceptEntity.class));
- final Set<PfConceptKey> keySetIn = new TreeSet<PfConceptKey>();
+ final Set<PfConceptKey> keySetIn = new TreeSet<>();
keySetIn.add(aKey1);
keySetIn.add(aKey2);
final int deletedCount = pfDao.deleteByConceptKey(DummyConceptEntity.class, keySetIn);
assertEquals(2, deletedCount);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertEquals(0, keyInfoSetOut.size());
keyInfoSetIn.add(keyInfo0);
keyInfoSetIn.add(keyInfo1);
keyInfoSetIn.add(keyInfo0);
pfDao.createCollection(keyInfoSetIn);
- keyInfoSetOut = new TreeSet<DummyConceptEntity>(pfDao.getAll(DummyConceptEntity.class));
+ keyInfoSetOut = new TreeSet<>(pfDao.getAll(DummyConceptEntity.class));
assertTrue(keyInfoSetIn.equals(keyInfoSetOut));
pfDao.deleteAll(DummyConceptEntity.class);
assertEquals(0, pfDao.size(DummyConceptEntity.class));
- final PfConceptKey owner0Key = new PfConceptKey("Owner0", "0.0.1");
- final PfConceptKey owner1Key = new PfConceptKey("Owner1", "0.0.1");
- final PfConceptKey owner2Key = new PfConceptKey("Owner2", "0.0.1");
- final PfConceptKey owner3Key = new PfConceptKey("Owner3", "0.0.1");
- final PfConceptKey owner4Key = new PfConceptKey("Owner4", "0.0.1");
- final PfConceptKey owner5Key = new PfConceptKey("Owner5", "0.0.1");
+ final PfConceptKey owner0Key = new PfConceptKey("Owner0", VERSION001);
+ final PfConceptKey owner1Key = new PfConceptKey("Owner1", VERSION001);
+ final PfConceptKey owner2Key = new PfConceptKey("Owner2", VERSION001);
+ final PfConceptKey owner3Key = new PfConceptKey("Owner3", VERSION001);
+ final PfConceptKey owner4Key = new PfConceptKey("Owner4", VERSION001);
+ final PfConceptKey owner5Key = new PfConceptKey("Owner5", VERSION001);
- pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity0"), 100.0));
+ pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, ENTITY0), 100.0));
pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity1"), 101.0));
pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity2"), 102.0));
pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner0Key, "Entity3"), 103.0));
pfDao.create(new DummyReferenceEntity(new PfReferenceKey(owner5Key, "EntityF"), 115.0));
TreeSet<DummyReferenceEntity> testEntitySetOut =
- new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class));
+ new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class));
assertEquals(16, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner0Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner0Key));
assertEquals(5, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner1Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner1Key));
assertEquals(3, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner2Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner2Key));
assertEquals(2, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner3Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner3Key));
assertEquals(1, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner4Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner4Key));
assertEquals(1, testEntitySetOut.size());
- testEntitySetOut = new TreeSet<DummyReferenceEntity>(pfDao.getAll(DummyReferenceEntity.class, owner5Key));
+ testEntitySetOut = new TreeSet<>(pfDao.getAll(DummyReferenceEntity.class, owner5Key));
assertEquals(4, testEntitySetOut.size());
- assertNotNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0")));
- assertNotNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0")));
+ assertNotNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0)));
+ assertNotNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0)));
assertNull(pfDao.get(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity1000")));
assertNull(pfDao.getConcept(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity1000")));
- pfDao.delete(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, "Entity0"));
+ pfDao.delete(DummyReferenceEntity.class, new PfReferenceKey(owner0Key, ENTITY0));
- final Set<PfReferenceKey> rKeySetIn = new TreeSet<PfReferenceKey>();
+ final Set<PfReferenceKey> rKeySetIn = new TreeSet<>();
rKeySetIn.add(new PfReferenceKey(owner4Key, "EntityB"));
rKeySetIn.add(new PfReferenceKey(owner5Key, "EntityD"));
}
private void testVersionOps() {
- final PfConceptKey aKey0 = new PfConceptKey("AAA0", "0.0.1");
- final PfConceptKey aKey1 = new PfConceptKey("AAA0", "0.0.2");
- final PfConceptKey aKey2 = new PfConceptKey("AAA0", "0.0.3");
- final PfConceptKey bKey0 = new PfConceptKey("BBB0", "0.0.1");
- final PfConceptKey bKey1 = new PfConceptKey("BBB0", "0.0.2");
- final PfConceptKey bKey2 = new PfConceptKey("BBB0", "0.0.3");
+ final PfConceptKey aKey0 = new PfConceptKey("AAA0", VERSION001);
+ final PfConceptKey aKey1 = new PfConceptKey("AAA0", VERSION002);
+ final PfConceptKey aKey2 = new PfConceptKey("AAA0", VERSION003);
+ final PfConceptKey bKey0 = new PfConceptKey("BBB0", VERSION001);
+ final PfConceptKey bKey1 = new PfConceptKey("BBB0", VERSION002);
+ final PfConceptKey bKey2 = new PfConceptKey("BBB0", VERSION003);
final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
- UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+ UUID.fromString(UUID0), DESCRIPTION0);
final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
- UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+ UUID.fromString(UUID1), DESCRIPTION1);
final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
- UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+ UUID.fromString(UUID2), DESCRIPTION2);
final DummyConceptEntity keyInfo3 = new DummyConceptEntity(bKey0,
- UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+ UUID.fromString(UUID0), DESCRIPTION0);
final DummyConceptEntity keyInfo4 = new DummyConceptEntity(bKey1,
- UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+ UUID.fromString(UUID1), DESCRIPTION1);
final DummyConceptEntity keyInfo5 = new DummyConceptEntity(bKey2,
- UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+ UUID.fromString(UUID2), DESCRIPTION2);
pfDao.create(keyInfo0);
pfDao.create(keyInfo1);
}
private void testgetFilteredOps() {
- final PfConceptKey aKey0 = new PfConceptKey("AAA0", "0.0.1");
- final PfConceptKey aKey1 = new PfConceptKey("AAA0", "0.0.2");
- final PfConceptKey aKey2 = new PfConceptKey("AAA0", "0.0.3");
- final PfConceptKey bKey0 = new PfConceptKey("BBB0", "0.0.1");
- final PfConceptKey bKey1 = new PfConceptKey("BBB0", "0.0.2");
- final PfConceptKey bKey2 = new PfConceptKey("BBB0", "0.0.3");
+ final PfConceptKey aKey0 = new PfConceptKey("AAA0", VERSION001);
+ final PfConceptKey aKey1 = new PfConceptKey("AAA0", VERSION002);
+ final PfConceptKey aKey2 = new PfConceptKey("AAA0", VERSION003);
+ final PfConceptKey bKey0 = new PfConceptKey("BBB0", VERSION001);
+ final PfConceptKey bKey1 = new PfConceptKey("BBB0", VERSION002);
+ final PfConceptKey bKey2 = new PfConceptKey("BBB0", VERSION003);
final DummyConceptEntity keyInfo0 = new DummyConceptEntity(aKey0,
- UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+ UUID.fromString(UUID0), DESCRIPTION0);
final DummyConceptEntity keyInfo1 = new DummyConceptEntity(aKey1,
- UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+ UUID.fromString(UUID1), DESCRIPTION1);
final DummyConceptEntity keyInfo2 = new DummyConceptEntity(aKey2,
- UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+ UUID.fromString(UUID2), DESCRIPTION2);
final DummyConceptEntity keyInfo3 = new DummyConceptEntity(bKey0,
- UUID.fromString("00000000-0000-0000-0000-000000000000"), "key description 0");
+ UUID.fromString(UUID0), DESCRIPTION0);
final DummyConceptEntity keyInfo4 = new DummyConceptEntity(bKey1,
- UUID.fromString("00000000-0000-0000-0000-000000000001"), "key description 1");
+ UUID.fromString(UUID1), DESCRIPTION1);
final DummyConceptEntity keyInfo5 = new DummyConceptEntity(bKey2,
- UUID.fromString("00000000-0000-0000-0000-000000000002"), "key description 2");
+ UUID.fromString(UUID2), DESCRIPTION2);
pfDao.create(keyInfo0);
pfDao.create(keyInfo1);
assertEquals(6, pfDao.getFiltered(DummyConceptEntity.class, null, null).size());
assertEquals(3, pfDao.getFiltered(DummyConceptEntity.class, "AAA0", null).size());
assertEquals(3, pfDao.getFiltered(DummyConceptEntity.class, "BBB0", null).size());
- assertEquals(1, pfDao.getFiltered(DummyConceptEntity.class, "BBB0", "0.0.3").size());
- assertEquals(6, pfDao.getFiltered(DummyConceptEntity.class, null, "0.0.3").size());
+ assertEquals(1, pfDao.getFiltered(DummyConceptEntity.class, "BBB0", VERSION003).size());
+ assertEquals(6, pfDao.getFiltered(DummyConceptEntity.class, null, VERSION003).size());
}
}
/*-
* ============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.
*
* @author Liam Fallon (liam.fallon@est.tech)
*/
+@FunctionalInterface
public interface ErrorResponseInfo {
/**
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.time.Instant;
import java.util.HashMap;
import java.util.UUID;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class AppcServiceProviderTest {
+ private static final String GENERIC_VNF_ID = "generic-vnf.vnf-id";
+
+ private static final String MODIFY_CONFIG = "ModifyConfig";
+
+ private static final String JSON_OUTPUT = "JSON Output: \n";
+
private static final Logger logger = LoggerFactory.getLogger(AppcServiceProviderTest.class);
private static final VirtualControlLoopEvent onsetEvent;
/* Construct an operation with an APPC actor and ModifyConfig operation. */
operation = new ControlLoopOperation();
operation.setActor("APPC");
- operation.setOperation("ModifyConfig");
+ operation.setOperation(MODIFY_CONFIG);
operation.setTarget("VNF");
operation.setEnd(Instant.now());
operation.setSubRequestId("1");
policy.setActor("APPC");
policy.setTarget(new Target(TargetType.VNF));
policy.getTarget().setResourceID("Eace933104d443b496b8.nodes.heat.vpg");
- policy.setRecipe("ModifyConfig");
+ policy.setRecipe(MODIFY_CONFIG);
policy.setPayload(null);
policy.setRetry(2);
policy.setTimeout(300);
/**
* Set up before test class.
+ * @throws Exception if the A&AI simulator cannot be started
*/
@BeforeClass
- public static void setUpSimulator() {
- try {
- Util.buildAaiSim();
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ public static void setUpSimulator() throws Exception {
+ Util.buildAaiSim();
}
/**
/* An action is required and cannot be null */
assertNotNull(appcRequest.getAction());
- assertEquals("ModifyConfig", appcRequest.getAction());
+ assertEquals(MODIFY_CONFIG, appcRequest.getAction());
/* A payload is required and cannot be null */
assertNotNull(appcRequest.getPayload());
- assertTrue(appcRequest.getPayload().containsKey("generic-vnf.vnf-id"));
- assertNotNull(appcRequest.getPayload().get("generic-vnf.vnf-id"));
+ assertTrue(appcRequest.getPayload().containsKey(GENERIC_VNF_ID));
+ assertNotNull(appcRequest.getPayload().get(GENERIC_VNF_ID));
assertTrue(appcRequest.getPayload().containsKey(KEY1));
assertTrue(appcRequest.getPayload().containsKey(KEY2));
/* Print out request as json to make sure serialization works */
String jsonRequest = Serialization.gsonPretty.toJson(appcRequest);
- logger.debug("JSON Output: \n" + jsonRequest);
+ logger.debug(JSON_OUTPUT + jsonRequest);
/* The JSON string must contain the following fields */
assertTrue(jsonRequest.contains("CommonHeader"));
assertTrue(jsonRequest.contains("Action"));
- assertTrue(jsonRequest.contains("ModifyConfig"));
+ assertTrue(jsonRequest.contains(MODIFY_CONFIG));
assertTrue(jsonRequest.contains("Payload"));
- assertTrue(jsonRequest.contains("generic-vnf.vnf-id"));
+ assertTrue(jsonRequest.contains(GENERIC_VNF_ID));
assertTrue(jsonRequest.contains(KEY1));
assertTrue(jsonRequest.contains(KEY2));
assertTrue(jsonRequest.contains(SUBKEY));
appcResponse.getStatus().setDescription("AppC success");
/* Print out request as json to make sure serialization works */
String jsonResponse = Serialization.gsonPretty.toJson(appcResponse);
- logger.debug("JSON Output: \n" + jsonResponse);
+ logger.debug(JSON_OUTPUT + jsonResponse);
}
@Test
/* An action is required and cannot be null */
assertNotNull(appcRequest.getAction());
- assertEquals("ModifyConfig", appcRequest.getAction());
+ assertEquals(MODIFY_CONFIG, appcRequest.getAction());
/* A payload is required and cannot be null */
assertNotNull(appcRequest.getPayload());
- assertTrue(appcRequest.getPayload().containsKey("generic-vnf.vnf-id"));
- assertNotNull(appcRequest.getPayload().get("generic-vnf.vnf-id"));
+ assertTrue(appcRequest.getPayload().containsKey(GENERIC_VNF_ID));
+ assertNotNull(appcRequest.getPayload().get(GENERIC_VNF_ID));
logger.debug("APPC Request: \n" + appcRequest.toString());
/* Print out request as json to make sure serialization works */
String jsonRequest = Serialization.gsonPretty.toJson(appcRequest);
- logger.debug("JSON Output: \n" + jsonRequest);
+ logger.debug(JSON_OUTPUT + jsonRequest);
/* The JSON string must contain the following fields */
assertTrue(jsonRequest.contains("CommonHeader"));
assertTrue(jsonRequest.contains("Action"));
- assertTrue(jsonRequest.contains("ModifyConfig"));
+ assertTrue(jsonRequest.contains(MODIFY_CONFIG));
assertTrue(jsonRequest.contains("Payload"));
- assertTrue(jsonRequest.contains("generic-vnf.vnf-id"));
+ assertTrue(jsonRequest.contains(GENERIC_VNF_ID));
Response appcResponse = new Response(appcRequest);
appcResponse.getStatus().setCode(ResponseCode.SUCCESS.getValue());
appcResponse.getStatus().setDescription("AppC success");
/* Print out request as json to make sure serialization works */
String jsonResponse = Serialization.gsonPretty.toJson(appcResponse);
- logger.debug("JSON Output: \n" + jsonResponse);
+ logger.debug(JSON_OUTPUT + jsonResponse);
}
@Test
* ============LICENSE_START=======================================================
* AppcServiceProviderTest
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.time.Instant;
import java.util.AbstractMap;
import java.util.HashMap;
import java.util.UUID;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.policy.aai.util.AaiException;
import org.onap.policy.appclcm.LcmCommonHeader;
import org.onap.policy.appclcm.LcmRequest;
import org.onap.policy.appclcm.LcmRequestWrapper;
public class AppcLcmActorServiceProviderTest {
+ private static final String VNF01 = "vnf01";
+
+ private static final String VNF_ID_KEY = "vnf-id";
+
+ private static final String REJECT = "REJECT";
+
+ private static final String PARTIAL_FAILURE = "PARTIAL FAILURE";
+
+ private static final String FAILURE = "FAILURE";
+
private static final Logger logger = LoggerFactory.getLogger(AppcLcmActorServiceProviderTest.class);
private static final VirtualControlLoopEvent onsetEvent;
/* Construct an operation with an APPC actor and restart operation. */
operation = new ControlLoopOperation();
operation.setActor("APPC");
- operation.setOperation("Restart");
+ operation.setOperation(RECIPE_RESTART);
operation.setTarget("VM");
operation.setEnd(Instant.now());
operation.setSubRequestId("1");
policy.setDescription("Upon getting the trigger event, restart the VM");
policy.setActor("APPC");
policy.setTarget(new Target(TargetType.VNF));
- policy.setRecipe("Restart");
+ policy.setRecipe(RECIPE_RESTART);
policy.setPayload(null);
policy.setRetry(2);
policy.setTimeout(300);
appcRequest.setAction("restart");
HashMap<String, String> actionIdentifiers = new HashMap<>();
- actionIdentifiers.put("vnf-id", "trial-vnf-003");
+ actionIdentifiers.put(VNF_ID_KEY, "trial-vnf-003");
appcRequest.setActionIdentifiers(actionIdentifiers);
/**
* Set up before test class.
+ * @throws Exception if an error occurs
*/
@BeforeClass
- public static void setUpSimulator() {
- try {
- Util.buildAaiSim();
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ public static void setUpSimulator() throws Exception {
+ Util.buildAaiSim();
}
/**
public void constructRestartRequestTest() {
LcmRequestWrapper dmaapRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, policy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, policy, VNF01);
/* The service provider must return a non null DMAAP request wrapper */
assertNotNull(dmaapRequest);
/* An action is required and cannot be null */
assertNotNull(appcRequest.getAction());
- assertEquals("Restart", appcRequest.getAction());
+ assertEquals(RECIPE_RESTART, appcRequest.getAction());
/* Action Identifiers are required and cannot be null */
assertNotNull(appcRequest.getActionIdentifiers());
- assertNotNull(appcRequest.getActionIdentifiers().get("vnf-id"));
- assertEquals("vnf01", appcRequest.getActionIdentifiers().get("vnf-id"));
+ assertNotNull(appcRequest.getActionIdentifiers().get(VNF_ID_KEY));
+ assertEquals(VNF01, appcRequest.getActionIdentifiers().get(VNF_ID_KEY));
logger.debug("APPC Request: \n" + appcRequest.toString());
}
/* If APPC rejects, PolicyResult is failure exception */
dmaapResponse.getBody().getStatus().setCode(300);
- dmaapResponse.getBody().getStatus().setMessage("REJECT");
+ dmaapResponse.getBody().getStatus().setMessage(REJECT);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
/* Test multiple reject codes */
dmaapResponse.getBody().getStatus().setCode(306);
- dmaapResponse.getBody().getStatus().setMessage("REJECT");
+ dmaapResponse.getBody().getStatus().setMessage(REJECT);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
dmaapResponse.getBody().getStatus().setCode(313);
- dmaapResponse.getBody().getStatus().setMessage("REJECT");
+ dmaapResponse.getBody().getStatus().setMessage(REJECT);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
/* If APPC returns failure, PolicyResult is failure */
dmaapResponse.getBody().getStatus().setCode(401);
- dmaapResponse.getBody().getStatus().setMessage("FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE, result.getKey());
/* Test multiple failure codes */
dmaapResponse.getBody().getStatus().setCode(406);
- dmaapResponse.getBody().getStatus().setMessage("FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE, result.getKey());
dmaapResponse.getBody().getStatus().setCode(450);
- dmaapResponse.getBody().getStatus().setMessage("FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE, result.getKey());
/* If APPC returns partial failure, PolicyResult is failure exception */
dmaapResponse.getBody().getStatus().setCode(501);
- dmaapResponse.getBody().getStatus().setMessage("PARTIAL FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(PARTIAL_FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
/* Test multiple partial failure codes */
dmaapResponse.getBody().getStatus().setCode(599);
- dmaapResponse.getBody().getStatus().setMessage("PARTIAL FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(PARTIAL_FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
dmaapResponse.getBody().getStatus().setCode(550);
- dmaapResponse.getBody().getStatus().setMessage("PARTIAL FAILURE");
+ dmaapResponse.getBody().getStatus().setMessage(PARTIAL_FAILURE);
result = AppcLcmActorServiceProvider.processResponse(dmaapResponse);
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
assertEquals(PolicyResult.FAILURE_EXCEPTION, result.getKey());
}
- /**
+ /*
* This test ensures that that if the the source entity is also the target entity, the source
* will be used for the APPC request.
*/
@Test
- public void sourceIsTargetTest() {
+ public void sourceIsTargetTest() throws Exception {
String resourceId = "82194af1-3c2c-485a-8f44-420e22a9eaa4";
- String targetVnfId = null;
- try {
- targetVnfId = AppcLcmActorServiceProvider.vnfNamedQuery(resourceId, "vnf01",
- "http://localhost:6666", "AAI", "AAI");
- } catch (AaiException e) {
- logger.warn(e.toString());
- fail("no vnf-id found");
- }
+ String targetVnfId = AppcLcmActorServiceProvider.vnfNamedQuery(resourceId, VNF01, "http://localhost:6666",
+ "AAI", "AAI");
assertNotNull(targetVnfId);
- assertEquals("vnf01", targetVnfId);
+ assertEquals(VNF01, targetVnfId);
}
- /**
- * THis test exercises getters not exercised in other tests.
+ /*
+ * This test exercises getters not exercised in other tests.
*/
@Test
public void testMethods() {
assertEquals("APPC", sp.actor());
assertEquals(4, sp.recipes().size());
- assertEquals("VM", sp.recipeTargets("Restart").get(0));
- assertEquals("vm-id", sp.recipePayloads("Restart").get(0));
+ assertEquals("VM", sp.recipeTargets(RECIPE_RESTART).get(0));
+ assertEquals("vm-id", sp.recipePayloads(RECIPE_RESTART).get(0));
}
@Test
// when
LcmRequestWrapper migrateRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, migratePolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, migratePolicy, VNF01);
LcmRequestWrapper rebuildRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, rebuildPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, rebuildPolicy, VNF01);
LcmRequestWrapper restartRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, restartPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, restartPolicy, VNF01);
// then
assertNull(migrateRequest.getBody().getPayload());
// when
LcmRequestWrapper noPayloadRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, noPayloadPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, noPayloadPolicy, VNF01);
LcmRequestWrapper emptyPayloadRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, emptyPayloadPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, emptyPayloadPolicy, VNF01);
// then
// when
LcmRequestWrapper dmaapRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, otherPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, otherPolicy, VNF01);
// then
assertEquals(dmaapRequest.getBody().getPayload(),
// when
LcmRequestWrapper dmaapRequest =
- AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, otherPolicy, "vnf01");
+ AppcLcmActorServiceProvider.constructRequest(onsetEvent, operation, otherPolicy, VNF01);
// then
assertEquals(dmaapRequest.getBody().getPayload(),
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.util.Objects;
import java.util.UUID;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class SdncActorServiceProviderTest {
+ private static final String REROUTE = "Reroute";
+
/**
- * Set up for test class.
+ * Set up before test class.
+ * @throws Exception if the A&AI simulator cannot be started
*/
@BeforeClass
- public static void setUpSimulator() {
- try {
- Util.buildAaiSim();
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ public static void setUpSimulator() throws Exception {
+ Util.buildAaiSim();
}
@AfterClass
ControlLoopOperation operation = new ControlLoopOperation();
Policy policy = new Policy();
- policy.setRecipe("Reroute");
+ policy.setRecipe(REROUTE);
SdncActorServiceProvider provider = new SdncActorServiceProvider();
assertNull(provider.constructRequest(onset, operation, policy));
onset.getAai().put("service-instance.service-instance-id", "service-instance-01");
assertNotNull(provider.constructRequest(onset, operation, policy));
- policy.setRecipe("Reroute");
+ policy.setRecipe(REROUTE);
assertNotNull(provider.constructRequest(onset, operation, policy));
SdncRequest request =
assertEquals("SDNC", sp.actor());
assertEquals(1, sp.recipes().size());
- assertEquals("Reroute", sp.recipes().get(0));
- assertEquals("VM", sp.recipeTargets("Reroute").get(0));
- assertEquals(0, sp.recipePayloads("Reroute").size());
+ assertEquals(REROUTE, sp.recipes().get(0));
+ assertEquals("VM", sp.recipeTargets(REROUTE).get(0));
+ assertEquals(0, sp.recipePayloads(REROUTE).size());
}
}
// Strings for recipes
private static final String RECIPE_MODIFY = "ModifyConfig";
- private static final String RECIPE_MODIFY_ANR = "ModifyConfigANR";
/* To be used in future releases when pci ModifyConfig is used */
private static final String SDNR_REQUEST_PARAMS = "request-parameters";
public class SdnrActorServiceProviderTest {
+ private static final String MODIFY_CONFIG = "ModifyConfig";
+
private static final Logger logger = LoggerFactory.getLogger(SdnrActorServiceProviderTest.class);
private static final VirtualControlLoopEvent onsetEvent;
/* Construct an operation with an SDNR actor and ModifyConfig operation. */
operation = new ControlLoopOperation();
operation.setActor("SDNR");
- operation.setOperation("ModifyConfig");
+ operation.setOperation(MODIFY_CONFIG);
operation.setTarget("VNF");
operation.setEnd(Instant.now());
operation.setSubRequestId("1");
policy.setActor("SDNR");
policy.setTarget(new Target(TargetType.VNF));
policy.getTarget().setResourceID("Eace933104d443b496b8.nodes.heat.vpg");
- policy.setRecipe("ModifyConfig");
+ policy.setRecipe(MODIFY_CONFIG);
policy.setPayload(null);
policy.setRetry(2);
policy.setTimeout(300);
/* An action is required and cannot be null */
assertNotNull(sdnrRequest.getAction());
- assertEquals("ModifyConfig", sdnrRequest.getAction());
+ assertEquals(MODIFY_CONFIG, sdnrRequest.getAction());
/* A payload is required and cannot be null */
assertNotNull(sdnrRequest.getPayload());
/* The JSON string must contain the following fields */
assertTrue(jsonRequest.contains("CommonHeader"));
assertTrue(jsonRequest.contains("Action"));
- assertTrue(jsonRequest.contains("ModifyConfig"));
+ assertTrue(jsonRequest.contains(MODIFY_CONFIG));
assertTrue(jsonRequest.contains("payload"));
PciResponse sdnrResponse = new PciResponse(sdnrRequest);
assertEquals("SDNR", sp.actor());
assertEquals(1, sp.recipes().size());
- assertEquals("VNF", sp.recipeTargets("ModifyConfig").get(0));
- assertEquals(2, sp.recipePayloads("ModifyConfig").size());
+ assertEquals("VNF", sp.recipeTargets(MODIFY_CONFIG).get(0));
+ assertEquals(2, sp.recipePayloads(MODIFY_CONFIG).size());
}
}
public class SoActorServiceProvider implements Actor {
private static final Logger logger = LoggerFactory.getLogger(SoActorServiceProvider.class);
+ private static final String TENANT_NOT_FOUND = "Tenant Item not found in AAI response {}";
+ private static final String CONSTRUCTED_SO_MSG = "Constructed SO request: {}";
+
// Strings for SO Actor
private static final String SO_ACTOR = "SO";
tenantItem = aaiResponseWrapper.getAaiNqResponse().getInventoryResponseItems().get(0).getItems()
.getInventoryResponseItems().get(1);
} catch (Exception e) {
- logger.error("Tenant Item not found in AAI response {}",
+ logger.error(TENANT_NOT_FOUND,
Serialization.gsonPretty.toJson(aaiResponseWrapper), e);
return null;
}
if (RECIPE_VF_MODULE_CREATE.equals(policy.getRecipe())) {
return constructCreateRequest(aaiResponseWrapper, policy, tenantItem, vnfItem, vnfServiceItem, soModelInfo);
} else if (RECIPE_VF_MODULE_DELETE.equals(policy.getRecipe())) {
- return constructDeleteRequest(tenantItem, vnfItem, vnfServiceItem, soModelInfo, policy);
+ return constructDeleteRequest(tenantItem, vnfItem, vnfServiceItem, policy);
} else {
return null;
}
private SoModelInfo prepareSoModelInfo(Policy policy) {
- SoModelInfo soModelInfo = new SoModelInfo();
- if ((policy.getTarget() != null && (policy.getTarget().getModelCustomizationId() != null))
- && (policy.getTarget().getModelInvariantId() != null) && (policy.getTarget().getModelName() != null)
- && (policy.getTarget().getModelVersion() != null) && (policy.getTarget().getModelVersionId() != null)) {
-
- soModelInfo.setModelCustomizationId(policy.getTarget().getModelCustomizationId());
- soModelInfo.setModelInvariantId(policy.getTarget().getModelInvariantId());
- soModelInfo.setModelName(policy.getTarget().getModelName());
- soModelInfo.setModelVersion(policy.getTarget().getModelVersion());
- soModelInfo.setModelVersionId(policy.getTarget().getModelVersionId());
- soModelInfo.setModelType("vfModule");
- return soModelInfo;
- } else {
+ if (policy.getTarget() == null || policy.getTarget().getModelCustomizationId() == null
+ || policy.getTarget().getModelInvariantId() == null) {
return null;
}
+
+ if (policy.getTarget().getModelName() == null || policy.getTarget().getModelVersion() == null
+ || policy.getTarget().getModelVersionId() == null) {
+ return null;
+ }
+
+ SoModelInfo soModelInfo = new SoModelInfo();
+ soModelInfo.setModelCustomizationId(policy.getTarget().getModelCustomizationId());
+ soModelInfo.setModelInvariantId(policy.getTarget().getModelInvariantId());
+ soModelInfo.setModelName(policy.getTarget().getModelName());
+ soModelInfo.setModelVersion(policy.getTarget().getModelVersion());
+ soModelInfo.setModelVersionId(policy.getTarget().getModelVersionId());
+ return soModelInfo;
}
/**
preserveInstanceIds(vnfItem.getGenericVnf().getVnfId(),
vnfServiceItem.getServiceInstance().getServiceInstanceId(), null);
if (logger.isDebugEnabled()) {
- logger.debug("Constructed SO request: {}", Serialization.gsonPretty.toJson(request));
+ logger.debug(CONSTRUCTED_SO_MSG, Serialization.gsonPretty.toJson(request));
}
return request;
}
* @param tenantItem tenant item from A&AI named-query response
* @param vnfItem vnf item from A&AI named-query response
* @param vnfServiceItem vnf service item from A&AI named-query response
- * @param vfModuleItem vf module item from A&AI named-query response
* @return SO delete vf-module request
*/
private SoRequest constructDeleteRequest(AaiNqInventoryResponseItem tenantItem, AaiNqInventoryResponseItem vnfItem,
- AaiNqInventoryResponseItem vnfServiceItem, SoModelInfo vfModuleItem, Policy policy) {
+ AaiNqInventoryResponseItem vnfServiceItem, Policy policy) {
SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
request.setRequestDetails(new SoRequestDetails());
vnfServiceItem.getServiceInstance().getServiceInstanceId(), null);
if (logger.isDebugEnabled()) {
- logger.debug("Constructed SO request: {}", Serialization.gsonPretty.toJson(request));
+ logger.debug(CONSTRUCTED_SO_MSG, Serialization.gsonPretty.toJson(request));
}
return request;
}
try {
tenantItem = aaiCqResponse.getDefaultTenant();
} catch (Exception e) {
- logger.error("Tenant Item not found in AAI response {}", Serialization.gsonPretty.toJson(aaiCqResponse), e);
+ logger.error(TENANT_NOT_FOUND, Serialization.gsonPretty.toJson(aaiCqResponse), e);
return null;
}
try {
cloudRegionItem = aaiCqResponse.getDefaultCloudRegion();
} catch (Exception e) {
- logger.error("Tenant Item not found in AAI response {}", Serialization.gsonPretty.toJson(aaiCqResponse), e);
+ logger.error(TENANT_NOT_FOUND, Serialization.gsonPretty.toJson(aaiCqResponse), e);
return null;
}
return constructCreateRequestCq(aaiCqResponse, policy, tenantItem, vnfItem, vnfServiceItem, soModelInfo,
cloudRegionItem);
} else if (RECIPE_VF_MODULE_DELETE.equals(policy.getRecipe())) {
- return constructDeleteRequestCq(tenantItem, vnfItem, vnfServiceItem, soModelInfo, policy, cloudRegionItem);
+ return constructDeleteRequestCq(tenantItem, vnfItem, vnfServiceItem, policy, cloudRegionItem);
} else {
return null;
}
// vfModuleId is not required for the create vf-module
preserveInstanceIds(vnfItem.getVnfId(), vnfServiceItem.getServiceInstanceId(), null);
if (logger.isDebugEnabled()) {
- logger.debug("Constructed SO request: {}", Serialization.gsonPretty.toJson(request));
+ logger.debug(CONSTRUCTED_SO_MSG, Serialization.gsonPretty.toJson(request));
}
return request;
}
* @param tenantItem Tenant from A&AI CQ request
* @param vnfItem Generic VNF from A&AI CQ request
* @param vnfServiceItem ServiceInstance from A&AI CQ request
- * @param vfModuleItem VFModule from A&AI CQ request
* @param policy policy information
* @param cloudRegionItem CloudRegion from A&AI CQ request
* @return SoRequest deleted
*/
private SoRequest constructDeleteRequestCq(Tenant tenantItem, GenericVnf vnfItem, ServiceInstance vnfServiceItem,
- SoModelInfo vfModuleItem, Policy policy, CloudRegion cloudRegionItem) {
+ Policy policy, CloudRegion cloudRegionItem) {
SoRequest request = new SoRequest();
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
request.setRequestDetails(new SoRequestDetails());
preserveInstanceIds(vnfItem.getVnfId(), vnfServiceItem.getServiceInstanceId(), null);
if (logger.isDebugEnabled()) {
- logger.debug("Constructed SO request: {}", Serialization.gsonPretty.toJson(request));
+ logger.debug(CONSTRUCTED_SO_MSG, Serialization.gsonPretty.toJson(request));
}
return request;
}
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.TreeMap;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
-import org.eclipse.persistence.exceptions.JAXBException;
import org.junit.Test;
import org.onap.policy.aai.AaiCqResponse;
import org.onap.policy.aai.AaiNqResponse;
public class SoActorServiceProviderTest {
+ private static final String C_VALUE = "cvalue";
+ private static final String A_VALUE = "avalue";
private static final String VF_MODULE_CREATE = "VF Module Create";
private static final String VF_MODULE_DELETE = "VF Module Delete";
request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
assertNotNull(request);
assertEquals(true, request.getRequestDetails().getRequestParameters().isUsePreload());
- assertEquals("avalue", request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
+ assertEquals(A_VALUE, request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
assertEquals(1, request.getRequestDetails().getConfigurationParameters().size());
- assertEquals("cvalue", request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
+ assertEquals(C_VALUE, request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
// payload with config, but no request params
policy.setPayload(makePayload());
@Test
public void testSendRequest() {
- try {
- SoActorServiceProvider.sendRequest(UUID.randomUUID().toString(), null, null, null, null, null);
- } catch (Exception e) {
- fail("Test should not throw an exception");
- }
+ SoActorServiceProvider.sendRequest(UUID.randomUUID().toString(), null, null, null, null, null);
}
@Test
request = new SoActorServiceProvider().constructRequestCq(onset, operation, policy, aaiCqResp);
assertNotNull(request);
assertEquals(true, request.getRequestDetails().getRequestParameters().isUsePreload());
- assertEquals("avalue", request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
+ assertEquals(A_VALUE, request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
assertEquals(1, request.getRequestDetails().getConfigurationParameters().size());
- assertEquals("cvalue", request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
+ assertEquals(C_VALUE, request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
// payload with config, but no request params
policy.setPayload(makePayload());
* @param fileName name of the file containing the JSON response
* @return output from the AAI vserver named-query
* @throws IOException if the file cannot be read
- * @throws JAXBException throws JAXBException
*/
- private AaiCqResponse loadAaiResponseCq(String fileName) throws IOException, JAXBException {
+ private AaiCqResponse loadAaiResponseCq(String fileName) throws IOException {
String resp = IOUtils.toString(getClass().getResource(fileName), StandardCharsets.UTF_8);
return new AaiCqResponse(resp);
}
params.setUsePreload(true);
Map<String, String> map = new TreeMap<>();
- map.put("akey", "avalue");
+ map.put("akey", A_VALUE);
List<Map<String, String>> lst = new LinkedList<>();
lst.add(map);
*/
private String makeConfigParams() {
Map<String, String> map = new TreeMap<>();
- map.put("ckey", "cvalue");
+ map.put("ckey", C_VALUE);
List<Map<String, String>> lst = new LinkedList<>();
lst.add(map);
import org.slf4j.LoggerFactory;
public class VfcActorServiceProvider implements Actor {
+ private static final String GENERIC_VNF_ID = "generic-vnf.vnf-id";
+
private static final Logger logger = LoggerFactory.getLogger(VfcActorServiceProvider.class);
// Strings for VFC Actor
request.setNsInstanceId(serviceInstance);
request.setRequestId(onset.getRequestId());
request.setHealRequest(new VfcHealRequest());
- request.getHealRequest().setVnfInstanceId(onset.getAai().get("generic-vnf.vnf-id"));
+ request.getHealRequest().setVnfInstanceId(onset.getAai().get(GENERIC_VNF_ID));
request.getHealRequest().setCause(operation.getMessage());
request.getHealRequest().setAdditionalParams(new VfcHealAdditionalParams());
AaiGetVnfResponse response = null;
UUID requestId = event.getRequestId();
String vnfName = event.getAai().get("generic-vnf.vnf-name");
- String vnfId = event.getAai().get("generic-vnf.vnf-id");
+ String vnfId = event.getAai().get(GENERIC_VNF_ID);
try {
if (vnfName != null) {
String url = aaiUrl + "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=";
request.setNsInstanceId(serviceInstance);
request.setRequestId(onset.getRequestId());
request.setHealRequest(new VfcHealRequest());
- request.getHealRequest().setVnfInstanceId(onset.getAai().get("generic-vnf.vnf-id"));
+ request.getHealRequest().setVnfInstanceId(onset.getAai().get(GENERIC_VNF_ID));
request.getHealRequest().setCause(operation.getMessage());
request.getHealRequest().setAdditionalParams(new VfcHealAdditionalParams());
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Objects;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
-import org.eclipse.persistence.exceptions.JAXBException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class VfcActorServiceProviderTest {
+ private static final String LOCAL_URL = "http://localhost:6666";
+ private static final String DOROTHY_GALE_1939 = "dorothy.gale.1939";
+ private static final String CQ_RESPONSE_JSON = "aai/AaiCqResponse.json";
+ private static final String RESTART = "Restart";
+
/**
- * Set up for test class.
+ * Set up before test class.
+ * @throws Exception if the A&AI simulator cannot be started
*/
@BeforeClass
- public static void setUpSimulator() {
- try {
- Util.buildAaiSim();
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ public static void setUpSimulator() throws Exception {
+ Util.buildAaiSim();
}
@AfterClass
assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, null, null, null));
- onset.getAai().put("generic-vnf.vnf-id", "dorothy.gale.1939");
+ onset.getAai().put("generic-vnf.vnf-id", DOROTHY_GALE_1939);
assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, null, null, null));
- assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, "http://localhost:6666",
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, LOCAL_URL,
"AAI", "AAI"));
UUID requestId = UUID.randomUUID();
onset.setRequestId(requestId);
- assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, "http://localhost:6666",
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, LOCAL_URL,
"AAI", "AAI"));
onset.getAai().put("generic-vnf.vnf-name", "Dorothy");
- assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, "http://localhost:6666",
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, LOCAL_URL,
"AAI", null));
- assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, "http://localhost:6666",
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, LOCAL_URL,
"AAI", "AAI"));
onset.getAai().put("service-instance.service-instance-id", "");
- assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, "http://localhost:6666",
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null, LOCAL_URL,
"AAI", "AAI"));
assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse(),
- "http://localhost:6666", "AAI", "AAI"));
+ LOCAL_URL, "AAI", "AAI"));
- policy.setRecipe("Restart");
+ policy.setRecipe(RESTART);
assertNotNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse(),
- "http://localhost:6666", "AAI", "AAI"));
+ LOCAL_URL, "AAI", "AAI"));
VfcRequest request = VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse(),
- "http://localhost:6666", "AAI", "AAI");
+ LOCAL_URL, "AAI", "AAI");
assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
- assertEquals("dorothy.gale.1939", request.getHealRequest().getVnfInstanceId());
+ assertEquals(DOROTHY_GALE_1939, request.getHealRequest().getVnfInstanceId());
assertEquals("restartvm", request.getHealRequest().getAdditionalParams().getAction());
}
assertEquals("VFC", sp.actor());
assertEquals(1, sp.recipes().size());
- assertEquals("Restart", sp.recipes().get(0));
- assertEquals("VM", sp.recipeTargets("Restart").get(0));
- assertEquals(0, sp.recipePayloads("Restart").size());
+ assertEquals(RESTART, sp.recipes().get(0));
+ assertEquals("VM", sp.recipeTargets(RESTART).get(0));
+ assertEquals(0, sp.recipePayloads(RESTART).size());
}
@Test
- public void testConstructRequestCq() throws IOException, JAXBException {
+ public void testConstructRequestCq() throws IOException {
VirtualControlLoopEvent onset = new VirtualControlLoopEvent();
ControlLoopOperation operation = new ControlLoopOperation();
assertNull(VfcActorServiceProvider.constructRequestCq(onset, operation, policy, null));
- onset.getAai().put("generic-vnf.vnf-id", "dorothy.gale.1939");
+ onset.getAai().put("generic-vnf.vnf-id", DOROTHY_GALE_1939);
assertNull(VfcActorServiceProvider.constructRequestCq(onset, operation, policy, null));
assertNull(VfcActorServiceProvider.constructRequestCq(onset, operation, policy, null));
assertNull(VfcActorServiceProvider.constructRequestCq(onset, operation, policy,
- loadAaiResponse("aai/AaiCqResponse.json")));
+ loadAaiResponse(CQ_RESPONSE_JSON)));
- policy.setRecipe("Restart");
+ policy.setRecipe(RESTART);
assertNotNull(VfcActorServiceProvider.constructRequestCq(onset, operation, policy,
- loadAaiResponse("aai/AaiCqResponse.json")));
+ loadAaiResponse(CQ_RESPONSE_JSON)));
VfcRequest request = VfcActorServiceProvider.constructRequestCq(onset, operation, policy,
- loadAaiResponse("aai/AaiCqResponse.json"));
+ loadAaiResponse(CQ_RESPONSE_JSON));
assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
- assertEquals("dorothy.gale.1939", request.getHealRequest().getVnfInstanceId());
+ assertEquals(DOROTHY_GALE_1939, request.getHealRequest().getVnfInstanceId());
assertEquals("restartvm", request.getHealRequest().getAdditionalParams().getAction());
}
* @param fileName name of the file containing the JSON response
* @return output from the AAI vserver named-query
* @throws IOException if the file cannot be read
- * @throws JAXBException throws JAXBException
*/
- private AaiCqResponse loadAaiResponse(String fileName) throws IOException, JAXBException {
+ private AaiCqResponse loadAaiResponse(String fileName) throws IOException {
String resp = IOUtils.toString(getClass().getResource(fileName), StandardCharsets.UTF_8);
return new AaiCqResponse(resp);
}
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Modifications 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.
public class ActorServiceProviderTest {
+ private static final String DOROTHY = "Dorothy";
+
@Test
public void testActorServiceProvider() {
ActorService actorService = ActorService.getInstance();
assertEquals("DummyActor", dummyActor.actor());
assertEquals(2, dummyActor.recipes().size());
- assertEquals("Dorothy", dummyActor.recipes().get(0));
+ assertEquals(DOROTHY, dummyActor.recipes().get(0));
assertEquals("Wizard", dummyActor.recipes().get(1));
- assertEquals(2, dummyActor.recipeTargets("Dorothy").size());
- assertEquals(2, dummyActor.recipePayloads("Dorothy").size());
+ assertEquals(2, dummyActor.recipeTargets(DOROTHY).size());
+ assertEquals(2, dummyActor.recipePayloads(DOROTHY).size());
}
}
/** The Constant logger. */
private static final Logger logger = LoggerFactory.getLogger(AaiManager.class);
+ private static final String APPLICATION_JSON = "application/json";
+
/** The rest manager. */
// The REST manager used for processing REST calls for this AAI manager
private final RestManager restManager;
return null;
} else {
JSONObject responseObj = new JSONObject(getResponse);
- JSONArray resultsArray = new JSONArray();
+ JSONArray resultsArray;
if (responseObj.has("result-data")) {
resultsArray = (JSONArray) responseObj.get("result-data");
} else {
url = url + CQ_URL;
Pair<Integer, String> httpDetails =
- this.restManager.put(url, username, password, headers, "application/json", requestJson);
+ this.restManager.put(url, username, password, headers, APPLICATION_JSON, requestJson);
logger.debug("RestManager.put after");
if (httpDetails == null) {
String requestJson = Serialization.gsonPretty.toJson(request);
NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, requestJson);
Pair<Integer, String> httpDetails =
- restManager.post(url, username, password, headers, "application/json", requestJson);
+ restManager.post(url, username, password, headers, APPLICATION_JSON, requestJson);
logger.debug("RestManager.post after");
if (httpDetails == null) {
headers.put("X-FromAppId", "POLICY");
headers.put("X-TransactionId", requestId.toString());
- headers.put("Accept", "application/json");
+ headers.put("Accept", APPLICATION_JSON);
return headers;
}
import org.slf4j.LoggerFactory;
public class AaiCqResponseTest {
+ private static final String ETE_VFMODULE = "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0";
+ private static final String ETE_VNF = "Ete_vFWCLvFWSNK_7ba1fbde_0";
private static final Logger LOGGER = LoggerFactory.getLogger(AaiCqResponseTest.class);
private static final String CQ_RESPONSE_SAMPLE = "src/test/resources/org/onap/policy/aai/AaiCqResponseFull.json";
aaiCqResponse = new AaiCqResponse(responseString);
GenericVnf genVnf = aaiCqResponse.getDefaultGenericVnf();
assertNotNull(genVnf);
- assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", genVnf.getVnfName());
+ assertEquals(ETE_VNF, genVnf.getVnfName());
LOGGER.info(genVnf.getVnfName());
}
AaiCqResponse aaiCqResponse;
aaiCqResponse = new AaiCqResponse(responseString);
- GenericVnf genVnf = aaiCqResponse.getGenericVnfByVnfName("Ete_vFWCLvFWSNK_7ba1fbde_0");
+ GenericVnf genVnf = aaiCqResponse.getGenericVnfByVnfName(ETE_VNF);
assertNotNull(genVnf);
assertEquals("f17face5-69cb-4c88-9e0b-7426db7edddd", genVnf.getVnfId());
LOGGER.info(genVnf.getVnfId());
GenericVnf genVnf =
aaiCqResponse.getGenericVnfByVfModuleModelInvariantId("e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e");
assertNotNull(genVnf);
- assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", genVnf.getVnfName());
+ assertEquals(ETE_VNF, genVnf.getVnfName());
LOGGER.info(genVnf.getVnfName());
}
AaiCqResponse aaiCqResponse;
aaiCqResponse = new AaiCqResponse(responseString);
- VfModule vfModule = aaiCqResponse.getVfModuleByVfModuleName("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0");
+ VfModule vfModule = aaiCqResponse.getVfModuleByVfModuleName(ETE_VFMODULE);
assertNotNull(vfModule);
- assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName());
+ assertEquals(ETE_VFMODULE, vfModule.getVfModuleName());
LOGGER.info(vfModule.getVfModuleName());
aaiCqResponse = new AaiCqResponse(responseString);
VfModule vfModule = aaiCqResponse.getVfModuleByVfModelInvariantId("e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e");
assertNotNull(vfModule);
- assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName());
+ assertEquals(ETE_VFMODULE, vfModule.getVfModuleName());
LOGGER.info(vfModule.getVfModuleName());
aaiCqResponse = new AaiCqResponse(responseString);
VfModule vfModule = aaiCqResponse.getDefaultVfModule();
assertNotNull(vfModule);
- assertEquals("Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0", vfModule.getVfModuleName());
+ assertEquals(ETE_VFMODULE, vfModule.getVfModuleName());
LOGGER.info(vfModule.getVfModuleName());
}
aaiCqResponse = new AaiCqResponse(responseString);
Vserver vserver = aaiCqResponse.getVserver();
assertNotNull(vserver);
- assertEquals("Ete_vFWCLvFWSNK_7ba1fbde_0", vserver.getVserverName());
+ assertEquals(ETE_VNF, vserver.getVserverName());
LOGGER.info(vserver.getVserverName());
}
import org.onap.policy.rest.RestManager.Pair;
public class AaiManagerTest {
+ private static final String VSERVER_NAME = "vserverName";
+ private static final String CQ_QUERY_URL = "http://testing.cq.query";
+ private static final String WITCH = "Witch";
+ private static final String DOROTHY = "Dorothy";
+ private static final String SOME_URL = "http://somewhere.over.the.rainbow";
+ private static final String ANOTHER_URL = "http://somewhere.under.the.rainbow";
RestManager restManagerMock;
UUID aaiNqRequestUuid = UUID.randomUUID();
Pair<Integer, String> httpResponseOk;
UUID vserverNameRequestId = UUID.randomUUID();
- when(restManagerMock.put(startsWith("http://testing.cq.query"), eq("Foo"), eq("Bar"), anyMap(), anyString(),
+ when(restManagerMock.put(startsWith(CQ_QUERY_URL), eq("Foo"), eq("Bar"), anyMap(), anyString(),
anyString())).thenReturn(httpCqResponseOk);
- when(restManagerMock.get(startsWith("http://testing.cq.query"), eq("Foo"), eq("Bar"), anyMap()))
+ when(restManagerMock.get(startsWith(CQ_QUERY_URL), eq("Foo"), eq("Bar"), anyMap()))
.thenReturn(httpTenantResponseOk);
AaiCqResponse aaiCqResponse =
- aaiManager.getCustomQueryResponse("http://testing.cq.query", "Foo", "Bar", vserverNameRequestId, "Foo");
+ aaiManager.getCustomQueryResponse(CQ_QUERY_URL, "Foo", "Bar", vserverNameRequestId, "Foo");
assertNotNull(aaiCqResponse);
when(restManagerMock.put(eq(""), eq("Foo"), eq("Bar"), anyMap(), anyString(), anyString()))
AaiNqRequest aaiNqRequest = new AaiNqRequest();
aaiNqRequest.setQueryParameters(aaiNqQueryParameters);
- when(restManagerMock.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap(),
+ when(restManagerMock.post(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap(),
anyString(), anyString())).thenReturn(httpResponseOk);
- AaiNqResponse aaiNqOkResponse = aaiManager.postQuery("http://somewhere.over.the.rainbow", "Dorothy", "Gale",
+ AaiNqResponse aaiNqOkResponse = aaiManager.postQuery(SOME_URL, DOROTHY, "Gale",
aaiNqRequest, aaiNqRequestUuid);
assertNotNull(aaiNqOkResponse);
- when(restManagerMock.post(isNull(), eq("Dorothy"), anyString(), anyMap(), anyString(), anyString()))
+ when(restManagerMock.post(isNull(), eq(DOROTHY), anyString(), anyMap(), anyString(), anyString()))
.thenReturn(null);
- AaiNqResponse aaiNqNullResponse = aaiManager.postQuery(null, "Dorothy", "Gale", null, aaiNqRequestUuid);
+ AaiNqResponse aaiNqNullResponse = aaiManager.postQuery(null, DOROTHY, "Gale", null, aaiNqRequestUuid);
assertNull(aaiNqNullResponse);
- when(restManagerMock.post(startsWith("http://somewhere.over.the.rainbow"), eq("Witch"), eq("West"), anyMap(),
+ when(restManagerMock.post(startsWith(SOME_URL), eq(WITCH), eq("West"), anyMap(),
anyString(), anyString())).thenReturn(httpResponseErr0);
- AaiNqResponse aaiNqNotOkResponse0 = aaiManager.postQuery("http://somewhere.over.the.rainbow", "Witch", "West",
+ AaiNqResponse aaiNqNotOkResponse0 = aaiManager.postQuery(SOME_URL, WITCH, "West",
aaiNqRequest, aaiNqRequestUuid);
assertNull(aaiNqNotOkResponse0);
- when(restManagerMock.post(startsWith("http://somewhere.under.the.rainbow"), eq("Witch"), eq("West"), anyMap(),
+ when(restManagerMock.post(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap(),
anyString(), anyString())).thenReturn(httpResponseErr1);
- AaiNqResponse aaiNqNotOkResponse1 = aaiManager.postQuery("http://somewhere.under.the.rainbow", "Witch", "West",
+ AaiNqResponse aaiNqNotOkResponse1 = aaiManager.postQuery(ANOTHER_URL, WITCH, "West",
aaiNqRequest, aaiNqRequestUuid);
assertNull(aaiNqNotOkResponse1);
}
UUID vserverNameRequestId = UUID.randomUUID();
- when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap()))
+ when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
.thenReturn(httpResponseOk);
- AaiGetVserverResponse vserverResponse = aaiManager.getQueryByVserverName("http://somewhere.over.the.rainbow",
- "Dorothy", "Gale", vserverNameRequestId, "vserverName");
+ AaiGetVserverResponse vserverResponse = aaiManager.getQueryByVserverName(SOME_URL,
+ DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME);
assertNotNull(vserverResponse);
AaiGetVserverResponse vserverNullResponse =
- aaiManager.getQueryByVserverName(null, "Dorothy", "Gale", vserverNameRequestId, "vserverName");
+ aaiManager.getQueryByVserverName(null, DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME);
assertNull(vserverNullResponse);
- when(restManagerMock.get(startsWith("http://somewhere.under.the.rainbow"), eq("Witch"), eq("West"), anyMap()))
+ when(restManagerMock.get(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap()))
.thenReturn(httpResponseErr0);
AaiGetVserverResponse vserverNotOkResponse0 = aaiManager.getQueryByVserverName(
- "http://somewhere.under.the.rainbow", "Witch", "West", vserverNameRequestId, "vserverName");
+ ANOTHER_URL, WITCH, "West", vserverNameRequestId, VSERVER_NAME);
assertNull(vserverNotOkResponse0);
}
UUID vserverNameRequestId = UUID.randomUUID();
- when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap()))
+ when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
.thenReturn(httpResponseOk);
- AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId("http://somewhere.over.the.rainbow", "Dorothy",
+ AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY,
"Gale", vserverNameRequestId, "vnfID");
assertNotNull(vnfResponse);
}
UUID vserverNameRequestId = UUID.randomUUID();
- when(restManagerMock.get(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Gale"), anyMap()))
+ when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
.thenReturn(httpResponseOk);
- AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId("http://somewhere.over.the.rainbow", "Dorothy",
+ AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY,
"Gale", vserverNameRequestId, "vnfName");
assertNotNull(vnfResponse);
}
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqCloudRegionTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqCloudRegion aaiNqCloudRegion = new AaiNqCloudRegion();
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqExtraPropertiesTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqExtraProperties aaiNqExtraProperties = new AaiNqExtraProperties();
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqExtraPropertyTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqExtraProperty aaiNqExtraProperty = new AaiNqExtraProperty();
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqGenericVnfTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
+ private static final String VERSION_ID = "98f410f6-4c63-447b-97d2-42508437cec0";
+ private static final String INVARIANT_ID = "653d2caa-7e47-4614-95b3-26c8d82755b8";
@Test
public void test() {
aaiNqGenericVnf.setIpv4Loopback0Address("aa");
aaiNqGenericVnf.setIpv4OamAddress("oamAddress");
aaiNqGenericVnf.setIsClosedLoopDisabled(false);
- aaiNqGenericVnf.setModelInvariantId("653d2caa-7e47-4614-95b3-26c8d82755b8");
- aaiNqGenericVnf.setModelVersionId("98f410f6-4c63-447b-97d2-42508437cec0");
+ aaiNqGenericVnf.setModelInvariantId(INVARIANT_ID);
+ aaiNqGenericVnf.setModelVersionId(VERSION_ID);
aaiNqGenericVnf.setModelCustomizationId("SomeCustomizationId");
aaiNqGenericVnf.setOperationalState("active");
- aaiNqGenericVnf.setPersonaModelId("653d2caa-7e47-4614-95b3-26c8d82755b8");
- aaiNqGenericVnf.setPersonaModelVersion("98f410f6-4c63-447b-97d2-42508437cec0");
+ aaiNqGenericVnf.setPersonaModelId(INVARIANT_ID);
+ aaiNqGenericVnf.setPersonaModelVersion(VERSION_ID);
aaiNqGenericVnf.setProvStatus("complete");
aaiNqGenericVnf.setResourceVersion("1505056714553");
aaiNqGenericVnf.setServiceId("e8cb8968-5411-478b-906a-f28747de72cd");
assertEquals("aa", aaiNqGenericVnf.getIpv4Loopback0Address());
assertEquals("oamAddress", aaiNqGenericVnf.getIpv4OamAddress());
assertEquals(false, aaiNqGenericVnf.getIsClosedLoopDisabled());
- assertEquals("653d2caa-7e47-4614-95b3-26c8d82755b8", aaiNqGenericVnf.getModelInvariantId());
- assertEquals("98f410f6-4c63-447b-97d2-42508437cec0", aaiNqGenericVnf.getModelVersionId());
+ assertEquals(INVARIANT_ID, aaiNqGenericVnf.getModelInvariantId());
+ assertEquals(VERSION_ID, aaiNqGenericVnf.getModelVersionId());
assertEquals("SomeCustomizationId", aaiNqGenericVnf.getModelCustomizationId());
assertEquals("active", aaiNqGenericVnf.getOperationalState());
- assertEquals("653d2caa-7e47-4614-95b3-26c8d82755b8", aaiNqGenericVnf.getPersonaModelId());
- assertEquals("98f410f6-4c63-447b-97d2-42508437cec0", aaiNqGenericVnf.getPersonaModelVersion());
+ assertEquals(INVARIANT_ID, aaiNqGenericVnf.getPersonaModelId());
+ assertEquals(VERSION_ID, aaiNqGenericVnf.getPersonaModelVersion());
assertEquals("complete", aaiNqGenericVnf.getProvStatus());
assertEquals("1505056714553", aaiNqGenericVnf.getResourceVersion());
assertEquals("e8cb8968-5411-478b-906a-f28747de72cd", aaiNqGenericVnf.getServiceId());
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqInstanceFiltersTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqInstanceFilters aaiNqInstanceFilters = new AaiNqInstanceFilters();
import static org.junit.Assert.assertNotNull;
import java.util.LinkedList;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AaiNqInventoryResponseItemTest {
+ private static final String WIDGET = "widget";
+ private static final String SERVICE_INSTANCE = "service-instance";
+ private static final String MODEL_VERSION_KEY = "model.model-version";
+ private static final String MODEL_TYPE_KEY = "model.model-type";
+ private static final String MODEL_NAME_KEY = "model.model-name";
+ private static final String MODEL_ID_KEY = "model.model-id";
+ private static final String PERSONA_MODEL_ID2 = "ef86f9c5-2165-44f3-8fc3-96018b609ea5";
+ private static final String PERSONA_MODEL_ID = "82194af1-3c2c-485a-8f44-420e22a9eaa4";
+ private static final String RESOURCE_VERSION = "1485366450";
private static final Logger logger = LoggerFactory.getLogger(AaiNqInventoryResponseItemTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqInventoryResponseItem aaiNqInventoryResponseItem = new AaiNqInventoryResponseItem();
- aaiNqInventoryResponseItem.setModelName("service-instance");
+ aaiNqInventoryResponseItem.setModelName(SERVICE_INSTANCE);
AaiNqCloudRegion aaiNqCloudRegion = new AaiNqCloudRegion();
aaiNqCloudRegion.setCloudOwner("OWNER");
aaiNqCloudRegion.setCloudRegionId("REGIONID");
aaiNqInventoryResponseItem.setCloudRegion(aaiNqCloudRegion);
AaiNqExtraProperties aaiNqExtraProperties = new AaiNqExtraProperties();
aaiNqExtraProperties.setExtraProperty(new LinkedList<>());
- aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-name", "generic-vnf"));
- aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf"));
+ aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ aaiNqExtraProperties.getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
aaiNqExtraProperties.getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
aaiNqExtraProperties.getExtraProperty()
.add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
aaiNqInventoryResponseItem.setExtraProperties(aaiNqExtraProperties);
aaiNqGenericVnf.setIpv4Loopback0Address("dhv-test-gvnfipv4-loopback0-address");
aaiNqGenericVnf.setInMaint(false);
aaiNqGenericVnf.setIsClosedLoopDisabled(false);
- aaiNqGenericVnf.setResourceVersion("1485366450");
+ aaiNqGenericVnf.setResourceVersion(RESOURCE_VERSION);
aaiNqGenericVnf.setEncrypedAccessFlag(true);
aaiNqGenericVnf.setPersonaModelId("acc6edd8-a8d4-4b93-afaa-0994068be14c");
aaiNqGenericVnf.setPersonaModelVersion("1.0");
aaiNqInventoryResponseItem.setGenericVnf(aaiNqGenericVnf);
AaiNqInventoryResponseItem serviceItem = new AaiNqInventoryResponseItem();
- serviceItem.setModelName("service-instance");
+ serviceItem.setModelName(SERVICE_INSTANCE);
serviceItem.setServiceInstance(new AaiNqServiceInstance());
serviceItem.getServiceInstance().setServiceInstanceId("dhv-test-vhnfportal-service-instance-id");
serviceItem.getServiceInstance().setServiceInstanceName("dhv-test-service-instance-name1");
- serviceItem.getServiceInstance().setPersonaModelId("82194af1-3c2c-485a-8f44-420e22a9eaa4");
+ serviceItem.getServiceInstance().setPersonaModelId(PERSONA_MODEL_ID);
serviceItem.getServiceInstance().setPersonaModelVersion("1.0");
serviceItem.getServiceInstance().setServiceInstanceLocationId("dhv-test-service-instance-location-id1");
serviceItem.getServiceInstance().setResourceVersion("1485366092");
serviceItem.setExtraProperties(new AaiNqExtraProperties());
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "service-instance"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, SERVICE_INSTANCE));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, PERSONA_MODEL_ID));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9"));
AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem();
vfModuleItem.setModelName("vf-module");
vfModuleItem.getVfModule().setHeatStackId("example-heat-stack-id-val-86300");
vfModuleItem.getVfModule().setOrchestrationStatus("example-orchestration-status-val-56523");
vfModuleItem.getVfModule().setIsBaseVfModule(true);
- vfModuleItem.getVfModule().setResourceVersion("1485366450");
- vfModuleItem.getVfModule().setPersonaModelId("ef86f9c5-2165-44f3-8fc3-96018b609ea5");
+ vfModuleItem.getVfModule().setResourceVersion(RESOURCE_VERSION);
+ vfModuleItem.getVfModule().setPersonaModelId(PERSONA_MODEL_ID2);
vfModuleItem.getVfModule().setPersonaModelVersion("1.0");
vfModuleItem.getVfModule().setWidgetModelId("example-widget-model-id-val-92571");
vfModuleItem.getVfModule().setWidgetModelVersion("example-widget-model-version-val-83317");
vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796");
vfModuleItem.setExtraProperties(new AaiNqExtraProperties());
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module"));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, PERSONA_MODEL_ID2));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AaiNqInventoryResponseItems aaiNqInventoryResponseItems = new AaiNqInventoryResponseItems();
aaiNqInventoryResponseItems.getInventoryResponseItems().add(serviceItem);
AaiNqServiceInstance serviceInstance = new AaiNqServiceInstance();
serviceInstance.setServiceInstanceId("dhv-test-vhnfportal-service-instance-id");
serviceInstance.setServiceInstanceName("dhv-test-service-instance-name1");
- serviceInstance.setPersonaModelId("82194af1-3c2c-485a-8f44-420e22a9eaa4");
+ serviceInstance.setPersonaModelId(PERSONA_MODEL_ID);
serviceInstance.setPersonaModelVersion("1.0");
serviceInstance.setServiceInstanceLocationId("dhv-test-service-instance-location-id1");
serviceInstance.setResourceVersion("1485366092");
aaiNqVfModule.setHeatStackId("example-heat-stack-id-val-86300");
aaiNqVfModule.setOrchestrationStatus("example-orchestration-status-val-56523");
aaiNqVfModule.setIsBaseVfModule(true);
- aaiNqVfModule.setResourceVersion("1485366450");
- aaiNqVfModule.setPersonaModelId("ef86f9c5-2165-44f3-8fc3-96018b609ea5");
+ aaiNqVfModule.setResourceVersion(RESOURCE_VERSION);
+ aaiNqVfModule.setPersonaModelId(PERSONA_MODEL_ID2);
aaiNqVfModule.setPersonaModelVersion("1.0");
aaiNqVfModule.setWidgetModelId("example-widget-model-id-val-92571");
aaiNqVfModule.setWidgetModelVersion("example-widget-model-version-val-83317");
import static org.junit.Assert.assertNotNull;
import java.util.LinkedList;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AaiNqInventoryResponseItemsTest {
+ private static final String WIDGET = "widget";
+ private static final String SERVICE_INSTANCE = "service-instance";
+ private static final String MODEL_VERSION_KEY = "model.model-version";
+ private static final String MODEL_TYPE_KEY = "model.model-type";
+ private static final String MODEL_NAME_KEY = "model.model-name";
+ private static final String MODEL_ID_KEY = "model.model-id";
private static final Logger logger = LoggerFactory.getLogger(AaiNqInventoryResponseItemsTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqInventoryResponseItem serviceItem = new AaiNqInventoryResponseItem();
- serviceItem.setModelName("service-instance");
- assertEquals("service-instance", serviceItem.getModelName());
+ serviceItem.setModelName(SERVICE_INSTANCE);
+ assertEquals(SERVICE_INSTANCE, serviceItem.getModelName());
serviceItem.setServiceInstance(new AaiNqServiceInstance());
serviceItem.getServiceInstance().setServiceInstanceId("dhv-test-vhnfportal-service-instance-id");
serviceItem.getServiceInstance().setResourceVersion("1485366092");
serviceItem.setExtraProperties(new AaiNqExtraProperties());
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "service-instance"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, SERVICE_INSTANCE));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9"));
AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem();
vfModuleItem.setModelName("vf-module");
vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796");
vfModuleItem.setExtraProperties(new AaiNqExtraProperties());
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module"));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem();
genericVnfItem.setModelName("generic-vnf");
genericVnfItem.setExtraProperties(new AaiNqExtraProperties());
genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>());
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "generic-vnf"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-type", "widget"));
+ .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
genericVnfItem.getExtraProperties().getExtraProperty()
.add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVnfItem.setItems(new AaiNqInventoryResponseItems());
import static org.junit.Assert.assertNotNull;
import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqNamedQueryTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqNamedQuery aaiNqNamedQuery = new AaiNqNamedQuery();
import static org.junit.Assert.assertNotNull;
import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AaiNqQueryParametersTest {
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqQueryParameters aaiNqQueryParameters = new AaiNqQueryParameters();
import static org.junit.Assert.assertNotNull;
import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class AaiNqRequestTest {
private static final Logger logger = LoggerFactory.getLogger(AaiNqRequestTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqRequest aaiNqRequest = new AaiNqRequest();
import org.slf4j.LoggerFactory;
public class AaiNqResponseTest {
+ private static final String WIDGET = "widget";
+ private static final String MODEL_VERSION_KEY = "model.model-version";
+ private static final String MODEL_TYPE_KEY = "model.model-type";
+ private static final String MODEL_NAME_KEY = "model.model-name";
+ private static final String MODEL_ID_KEY = "model.model-id";
private static final Logger logger = LoggerFactory.getLogger(AaiNqResponseTest.class);
@Test
serviceItem.getServiceInstance().setResourceVersion("1485366092");
serviceItem.setExtraProperties(new AaiNqExtraProperties());
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "service-instance"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "service-instance"));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9"));
AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem();
vfModuleItem.setModelName("vf-module");
vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796");
vfModuleItem.setExtraProperties(new AaiNqExtraProperties());
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module"));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem();
genericVnfItem.setModelName("generic-vnf");
genericVnfItem.setExtraProperties(new AaiNqExtraProperties());
genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>());
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "generic-vnf"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-type", "widget"));
+ .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
genericVnfItem.getExtraProperties().getExtraProperty()
.add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVnfItem.setItems(new AaiNqInventoryResponseItems());
import org.slf4j.LoggerFactory;
public class AaiNqResponseWrapperTest {
+ private static final String WIDGET = "widget";
+ private static final String MODEL_VERSION_KEY = "model.model-version";
+ private static final String MODEL_TYPE_KEY = "model.model-type";
+ private static final String MODEL_NAME_KEY = "model.model-name";
+ private static final String MODEL_ID_KEY = "model.model-id";
+ private static final String VERSION_JSON = "AaiNqResponseWrapper-Vserver.json";
+ private static final String NO_NAMES_JSON = "AaiNqResponseWrapper-NoNames.json";
private static final Logger logger = LoggerFactory.getLogger(AaiNqResponseWrapperTest.class);
@Test
serviceItem.getServiceInstance().setResourceVersion("1485366092");
serviceItem.setExtraProperties(new AaiNqExtraProperties());
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "service-instance"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "service-instance"));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ serviceItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "82194af1-3c2c-485a-8f44-420e22a9eaa4"));
serviceItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "46b92144-923a-4d20-b85a-3cbd847668a9"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "46b92144-923a-4d20-b85a-3cbd847668a9"));
AaiNqInventoryResponseItem vfModuleItem = new AaiNqInventoryResponseItem();
vfModuleItem.setModelName("vf-module");
vfModuleItem.getVfModule().setContrailServiceInstanceFqdn("example-contrail-service-instance-fqdn-val-86796");
vfModuleItem.setExtraProperties(new AaiNqExtraProperties());
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "vf-module"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-type", "widget"));
- vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "vf-module"));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
+ vfModuleItem.getExtraProperties().getExtraProperty().add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "ef86f9c5-2165-44f3-8fc3-96018b609ea5"));
vfModuleItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "c00563ae-812b-4e62-8330-7c4d0f47088a"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "c00563ae-812b-4e62-8330-7c4d0f47088a"));
AaiNqInventoryResponseItem genericVnfItem = new AaiNqInventoryResponseItem();
genericVnfItem.setModelName("generic-vnf");
genericVnfItem.setExtraProperties(new AaiNqExtraProperties());
genericVnfItem.getExtraProperties().setExtraProperty(new LinkedList<>());
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-name", "generic-vnf"));
+ .add(new AaiNqExtraProperty(MODEL_NAME_KEY, "generic-vnf"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-type", "widget"));
+ .add(new AaiNqExtraProperty(MODEL_TYPE_KEY, WIDGET));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-version", "1.0"));
+ .add(new AaiNqExtraProperty(MODEL_VERSION_KEY, "1.0"));
genericVnfItem.getExtraProperties().getExtraProperty()
- .add(new AaiNqExtraProperty("model.model-id", "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
+ .add(new AaiNqExtraProperty(MODEL_ID_KEY, "acc6edd8-a8d4-4b93-afaa-0994068be14c"));
genericVnfItem.getExtraProperties().getExtraProperty()
.add(new AaiNqExtraProperty("model.model-name-version-id", "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"));
genericVnfItem.setItems(new AaiNqInventoryResponseItems());
// null item
resp = new AaiNqResponseWrapper();
assertEquals(0, resp.countVfModules());
-
+
// no names
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json"));
+ resp.setAaiNqResponse(load(NO_NAMES_JSON));
assertEquals(0, resp.countVfModules());
// has VF modules
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json"));
+ resp.setAaiNqResponse(load(VERSION_JSON));
assertEquals(3, resp.countVfModules());
}
// null item
resp = new AaiNqResponseWrapper();
assertEquals(null, resp.genVfModuleName());
-
+
// no names
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json"));
+ resp.setAaiNqResponse(load(NO_NAMES_JSON));
assertEquals(null, resp.genVfModuleName());
// has VF modules
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json"));
+ resp.setAaiNqResponse(load(VERSION_JSON));
assertEquals("my-module-abc_124", resp.genVfModuleName());
}
resp.getAaiNqResponse().getInventoryResponseItems().get(0).getItems().getInventoryResponseItems().get(0)
.getItems().setInventoryResponseItems(null);
assertTrue(resp.getVfModuleItems(false).isEmpty());
-
+
// no modules
resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoModules.json"));
assertTrue(resp.getVfModuleItems(false).isEmpty());
-
+
// no names
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-NoNames.json"));
+ resp.setAaiNqResponse(load(NO_NAMES_JSON));
List<AaiNqInventoryResponseItem> lst;
lst = resp.getVfModuleItems(false);
assertEquals(0, lst.size());
// base VF modules
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json"));
+ resp.setAaiNqResponse(load(VERSION_JSON));
lst = resp.getVfModuleItems(true);
assertEquals(1, lst.size());
assertEquals("Vfmodule_vLBMS-0809-1", lst.get(0).getVfModule().getVfModuleName());
-
+
// non base VF modules
- resp.setAaiNqResponse(load("AaiNqResponseWrapper-Vserver.json"));
+ resp.setAaiNqResponse(load(VERSION_JSON));
lst = resp.getVfModuleItems(false);
assertEquals(3, lst.size());
int index;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class AaiNqServiceInstanceTest {
private static final Logger logger = LoggerFactory.getLogger(AaiNqServiceInstanceTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqServiceInstance aaiNqServiceInstance = new AaiNqServiceInstance();
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class AaiNqTenantTest {
private static final Logger logger = LoggerFactory.getLogger(AaiNqTenantTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqTenant aaiNqTenant = new AaiNqTenant();
import java.io.File;
import java.nio.file.Files;
import java.util.List;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class AaiNqVServerTest {
private static final Logger logger = LoggerFactory.getLogger(AaiNqVServerTest.class);
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() throws Exception {
// deserialize json and verify fields are populated properly
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class AaiNqVfModuleTest {
private static final Logger logger = LoggerFactory.getLogger(AaiNqVfModuleTest.class);
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
AaiNqVfModule aaiNqVfModule = new AaiNqVfModule();
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PnfInstanceTest {
+ private static final String PNF_NAME_TEST = "pnf-name-test";
private static final Logger logger = LoggerFactory.getLogger(PnfInstanceTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
PnfInstance pnfInstance = new PnfInstance();
pnfInstance.setPnfInstanceName("pnf-instance-name-test");
- pnfInstance.setPnfName("pnf-name-test");
+ pnfInstance.setPnfName(PNF_NAME_TEST);
pnfInstance.setPnfType(PnfType.ENODEB);
pnfInstance.setPnfSerial("pnf-serial-test");
assertNotNull(pnfInstance);
PnfInstance pnfInstanceClone = new PnfInstance(pnfInstance);
assertNotNull(pnfInstanceClone);
- assertEquals("pnf-name-test", pnfInstanceClone.getPnfName());
+ assertEquals(PNF_NAME_TEST, pnfInstanceClone.getPnfName());
assertEquals(PnfType.ENODEB, pnfInstanceClone.getPnfType());
assertEquals("pnf-serial-test", pnfInstanceClone.getPnfSerial());
assertNotEquals(0, new Pnf().hashCode());
PnfInstance pnfInstanceOther0 = new PnfInstance();
- pnfInstanceOther0.setPnfName("pnf-name-test");
+ pnfInstanceOther0.setPnfName(PNF_NAME_TEST);
PnfInstance pnfInstanceOther1 = new PnfInstance(pnfInstance);
pnfInstanceOther1.setPnfName("pnf-name-test-diff");
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PnfTest {
+ private static final String PNF_NAME_TEST = "pnf-name-test";
private static final Logger logger = LoggerFactory.getLogger(PnfTest.class);
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
Pnf pnf = new Pnf();
- pnf.setPnfName("pnf-name-test");
+ pnf.setPnfName(PNF_NAME_TEST);
pnf.setPnfType(PnfType.ENODEB);
assertNotNull(pnf);
Pnf pnfClone = new Pnf(pnf);
assertNotNull(pnfClone);
- assertEquals("pnf-name-test", pnfClone.getPnfName());
+ assertEquals(PNF_NAME_TEST, pnfClone.getPnfName());
assertEquals(PnfType.ENODEB, pnfClone.getPnfType());
assertEquals("PNF [PNFName=pnf-name-test, PNFType=eNodeB]", pnfClone.toString());
assertNotEquals(0, new Pnf().hashCode());
Pnf pnfOther = new Pnf();
- pnfOther.setPnfName("pnf-name-test");
+ pnfOther.setPnfName(PNF_NAME_TEST);
assertTrue(pnf.equals(pnf));
assertFalse(pnf.equals(null));
import static org.junit.Assert.assertNotNull;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.aai.util.Serialization;
import org.slf4j.Logger;
public class PnfTypeTest {
private static final Logger logger = LoggerFactory.getLogger(PnfTypeTest.class);
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {}
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {}
-
@Test
public void test() {
PnfType pnfType = PnfType.ENODEB;
public class AaiExceptionTest {
+ private static final String MESSAGE = "message";
+
@Test
public void test() {
assertNotNull(new AaiException());
- assertNotNull(new AaiException("message"));
- assertNotNull(new AaiException("message", new IOException()));
- assertNotNull(new AaiException("message", new IOException(), true, false));
+ assertNotNull(new AaiException(MESSAGE));
+ assertNotNull(new AaiException(MESSAGE, new IOException()));
+ assertNotNull(new AaiException(MESSAGE, new IOException(), true, false));
assertNotNull(new AaiException(new IOException()));
}
* ============LICENSE_END=========================================================
*/
-/*-
- * ============LICENSE_START=======================================================
- * appc
- * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
package org.onap.policy.appc;
import static org.junit.Assert.assertEquals;
public class CommonHeaderTest {
+ private static final String KANSAS = "Kansas";
+ private static final String DOROTHY = "Dorothy";
+ private static final String CAN_I_GO_HOME = "Can I go home?";
+
@Test
public void testCommonHeader() {
CommonHeader commonHeader = new CommonHeader();
assertNotNull(new CommonHeader(commonHeader));
assertNotEquals(0, commonHeader.hashCode());
- commonHeader.setApiVer("Kansas");
- assertEquals("Kansas", commonHeader.getApiVer());
+ commonHeader.setApiVer(KANSAS);
+ assertEquals(KANSAS, commonHeader.getApiVer());
List<Map<String, String>> flagSet = new ArrayList<>();
commonHeader.setFlags(flagSet);
assertEquals(flagSet, commonHeader.getFlags());
- commonHeader.setOriginatorId("Dorothy");
- assertEquals("Dorothy", commonHeader.getOriginatorId());
+ commonHeader.setOriginatorId(DOROTHY);
+ assertEquals(DOROTHY, commonHeader.getOriginatorId());
UUID requestId = UUID.randomUUID();
commonHeader.setRequestId(requestId);
commonHeader.setRequestTrack(requestTrackSet);
assertEquals(requestTrackSet, commonHeader.getRequestTrack());
- commonHeader.setSubRequestId("Can I go home?");
- assertEquals("Can I go home?", commonHeader.getSubRequestId());
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
+ assertEquals(CAN_I_GO_HOME, commonHeader.getSubRequestId());
Instant timestamp = Instant.now();
commonHeader.setTimeStamp(timestamp);
assertFalse(commonHeader.equals(copiedCommonHeader));
copiedCommonHeader.setApiVer(null);
assertTrue(commonHeader.equals(copiedCommonHeader));
- commonHeader.setApiVer("Kansas");
+ commonHeader.setApiVer(KANSAS);
assertFalse(commonHeader.equals(copiedCommonHeader));
- copiedCommonHeader.setApiVer("Kansas");
+ copiedCommonHeader.setApiVer(KANSAS);
assertTrue(commonHeader.equals(copiedCommonHeader));
commonHeader.setFlags(null);
assertFalse(commonHeader.equals(copiedCommonHeader));
copiedCommonHeader.setOriginatorId(null);
assertTrue(commonHeader.equals(copiedCommonHeader));
- commonHeader.setOriginatorId("Dorothy");
+ commonHeader.setOriginatorId(DOROTHY);
assertFalse(commonHeader.equals(copiedCommonHeader));
- copiedCommonHeader.setOriginatorId("Dorothy");
+ copiedCommonHeader.setOriginatorId(DOROTHY);
assertTrue(commonHeader.equals(copiedCommonHeader));
commonHeader.setRequestId(null);
assertFalse(commonHeader.equals(copiedCommonHeader));
copiedCommonHeader.setSubRequestId(null);
assertTrue(commonHeader.equals(copiedCommonHeader));
- commonHeader.setSubRequestId("Can I go home?");
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
assertFalse(commonHeader.equals(copiedCommonHeader));
- copiedCommonHeader.setSubRequestId("Can I go home?");
+ copiedCommonHeader.setSubRequestId(CAN_I_GO_HOME);
assertTrue(commonHeader.equals(copiedCommonHeader));
commonHeader.setTimeStamp(null);
public class RequestTest {
+ private static final String WIZARD = "Wizard";
+ private static final String GO_TO_OZ = "Go to Oz";
+
@Test
public void testRequest() {
Request request = new Request();
request.setCommonHeader(commonHeader);
assertEquals(commonHeader, request.getCommonHeader());
- request.setAction("Go to Oz");
- assertEquals("Go to Oz", request.getAction());
+ request.setAction(GO_TO_OZ);
+ assertEquals(GO_TO_OZ, request.getAction());
- request.setObjectId("Wizard");
- assertEquals("Wizard", request.getObjectId());
+ request.setObjectId(WIZARD);
+ assertEquals(WIZARD, request.getObjectId());
request.setTargetId("Oz");
assertEquals("Oz", request.getTargetId());
assertFalse(request.equals(copiedRequest));
copiedRequest.setAction(null);
assertTrue(request.equals(copiedRequest));
- request.setAction("Go to Oz");
+ request.setAction(GO_TO_OZ);
assertFalse(request.equals(copiedRequest));
- copiedRequest.setAction("Go to Oz");
+ copiedRequest.setAction(GO_TO_OZ);
assertTrue(request.equals(copiedRequest));
request.setObjectId(null);
assertFalse(request.equals(copiedRequest));
copiedRequest.setObjectId(null);
assertTrue(request.equals(copiedRequest));
- request.setObjectId("Wizard");
+ request.setObjectId(WIZARD);
assertFalse(request.equals(copiedRequest));
- copiedRequest.setObjectId("Wizard");
+ copiedRequest.setObjectId(WIZARD);
assertTrue(request.equals(copiedRequest));
request.setTargetId(null);
public class ResponseStatusTest {
+ private static final String THERE_S_NO_PLACE_LIKE_HOME = "There's no place like home";
+ private static final String THE_WONDERFUL_LAND_OF_OZ = "The wonderful land of Oz";
+
@Test
public void testResonseStatus() {
ResponseStatus status = new ResponseStatus();
status.setCode(1234);
assertEquals(1234, status.getCode());
- status.setDescription("The wonderful land of Oz");
- assertEquals("The wonderful land of Oz", status.getDescription());
+ status.setDescription(THE_WONDERFUL_LAND_OF_OZ);
+ assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getDescription());
- status.setValue("There's no place like home");
- assertEquals("There's no place like home", status.getValue());
+ status.setValue(THERE_S_NO_PLACE_LIKE_HOME);
+ assertEquals(THERE_S_NO_PLACE_LIKE_HOME, status.getValue());
assertNotEquals(0, status.hashCode());
assertEquals("ResponseStatus [Code=1234, Value=There's no pla", status.toString().substring(0, 47));
assertFalse(status.equals(copiedStatus));
copiedStatus.setDescription(null);
assertTrue(status.equals(copiedStatus));
- status.setDescription("The wonderful land of Oz");
+ status.setDescription(THE_WONDERFUL_LAND_OF_OZ);
assertFalse(status.equals(copiedStatus));
- copiedStatus.setDescription("The wonderful land of Oz");
+ copiedStatus.setDescription(THE_WONDERFUL_LAND_OF_OZ);
assertTrue(status.equals(copiedStatus));
status.setValue(null);
assertFalse(status.equals(copiedStatus));
copiedStatus.setValue(null);
assertTrue(status.equals(copiedStatus));
- status.setValue("There's no place like home");
+ status.setValue(THERE_S_NO_PLACE_LIKE_HOME);
assertFalse(status.equals(copiedStatus));
- copiedStatus.setValue("There's no place like home");
+ copiedStatus.setValue(THERE_S_NO_PLACE_LIKE_HOME);
assertTrue(status.equals(copiedStatus));
}
}
public class AppcLcmTest {
+ private static final String VNF_ID_KEY = "vnf-id";
+
+ private static final String RESTART = "restart";
+
+ private static final String CORRELATION_ID = "664be3d2-6c12-4f4b-a3e7-c349acced200";
+
private static final Logger logger = LoggerFactory.getLogger(AppcLcmTest.class);
private static LcmRequestWrapper dmaapRequest;
* Construct an APPCLCM Request to be Serialized
*/
dmaapRequest = new LcmRequestWrapper();
- dmaapRequest.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
- dmaapRequest.setRpcName("restart");
+ dmaapRequest.setCorrelationId(CORRELATION_ID + "-" + "1");
+ dmaapRequest.setRpcName(RESTART);
dmaapRequest.setType("request");
dmaapResponse = new LcmResponseWrapper();
- dmaapResponse.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
- dmaapResponse.setRpcName("restart");
+ dmaapResponse.setCorrelationId(CORRELATION_ID + "-" + "1");
+ dmaapResponse.setRpcName(RESTART);
dmaapResponse.setType("response");
LcmRequest appcRequest = new LcmRequest();
- appcRequest.setAction("restart");
+ appcRequest.setAction(RESTART);
HashMap<String, String> actionIdentifiers = new HashMap<>();
- actionIdentifiers.put("vnf-id", "trial-vnf-003");
+ actionIdentifiers.put(VNF_ID_KEY, "trial-vnf-003");
actionIdentifiers.put("vserver-id", "08f6c1f9-99e7-49f3-a662-c62b9f200d79");
appcRequest.setActionIdentifiers(actionIdentifiers);
LcmCommonHeader commonHeader = new LcmCommonHeader();
- commonHeader.setRequestId(UUID.fromString("664be3d2-6c12-4f4b-a3e7-c349acced200"));
+ commonHeader.setRequestId(UUID.fromString(CORRELATION_ID));
commonHeader.setSubRequestId("1");
- commonHeader.setOriginatorId("664be3d2-6c12-4f4b-a3e7-c349acced200");
+ commonHeader.setOriginatorId(CORRELATION_ID);
appcRequest.setCommonHeader(commonHeader);
* action-identifiers should exist and contain a vnf-id
*/
assertTrue(jsonRequest.contains("action-identifiers"));
- assertTrue(jsonRequest.contains("vnf-id"));
+ assertTrue(jsonRequest.contains(VNF_ID_KEY));
/*
* The action sub-tag should exist
/*
* Use the serializer to convert the json string into a java object
*/
- LcmRequestWrapper dmaapRequest = Serialization.gson.fromJson(jsonRequest, LcmRequestWrapper.class);
- assertNotNull(dmaapRequest);
+ LcmRequestWrapper req = Serialization.gson.fromJson(jsonRequest, LcmRequestWrapper.class);
+ assertNotNull(req);
/*
* The type of the DMAAP wrapper should be request
*/
- assertEquals("request", dmaapRequest.getType());
+ assertEquals("request", req.getType());
/*
* The DMAAP wrapper must have a body as that is the true APPC request
*/
- assertNotNull(dmaapRequest.getBody());
- LcmRequest appcRequest = dmaapRequest.getBody();
+ assertNotNull(req.getBody());
+ LcmRequest appcRequest = req.getBody();
assertNotNull(appcRequest);
/*
* The action should not be null and should be set to restart
*/
assertNotNull(appcRequest.getAction());
- assertEquals("restart", appcRequest.getAction());
+ assertEquals(RESTART, appcRequest.getAction());
/*
* The action-identifiers should not be null and should contain a vnf-id
*/
assertNotNull(appcRequest.getActionIdentifiers());
- assertNotNull(appcRequest.getActionIdentifiers().get("vnf-id"));
+ assertNotNull(appcRequest.getActionIdentifiers().get(VNF_ID_KEY));
logger.debug("Request as a Java Object: \n" + appcRequest.toString() + "\n\n");
}
/*
* Use the serializer to convert the json string into a java object
*/
- LcmResponseWrapper dmaapResponse = Serialization.gson.fromJson(jsonResponse, LcmResponseWrapper.class);
- assertNotNull(dmaapResponse);
+ LcmResponseWrapper resp = Serialization.gson.fromJson(jsonResponse, LcmResponseWrapper.class);
+ assertNotNull(resp);
/*
* The type of the DMAAP wrapper should be response
*/
- assertEquals("response", dmaapResponse.getType());
+ assertEquals("response", resp.getType());
/*
* The DMAAP wrapper must have a body as that is the true APPC response
*/
- assertNotNull(dmaapResponse.getBody());
- LcmResponse appcResponse = dmaapResponse.getBody();
+ assertNotNull(resp.getBody());
+ LcmResponse appcResponse = resp.getBody();
assertNotNull(appcResponse);
/*
public class LcmCommonHeaderTest {
+ private static final String KANSAS = "Kansas";
+ private static final String DOROTHY = "Dorothy";
+ private static final String CAN_I_GO_HOME = "Can I go home?";
+
@Test
public void testLcmCommonHeader() {
LcmCommonHeader commonHeader = new LcmCommonHeader();
assertNotNull(new LcmCommonHeader(commonHeader));
assertNotEquals(0, commonHeader.hashCode());
- commonHeader.setApiVer("Kansas");
- assertEquals("Kansas", commonHeader.getApiVer());
+ commonHeader.setApiVer(KANSAS);
+ assertEquals(KANSAS, commonHeader.getApiVer());
Map<String, String> flagMap = new HashMap<>();
commonHeader.setFlags(flagMap);
assertEquals(flagMap, commonHeader.getFlags());
- commonHeader.setOriginatorId("Dorothy");
- assertEquals("Dorothy", commonHeader.getOriginatorId());
+ commonHeader.setOriginatorId(DOROTHY);
+ assertEquals(DOROTHY, commonHeader.getOriginatorId());
UUID requestId = UUID.randomUUID();
commonHeader.setRequestId(requestId);
assertEquals(requestId, commonHeader.getRequestId());
- commonHeader.setSubRequestId("Can I go home?");
- assertEquals("Can I go home?", commonHeader.getSubRequestId());
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
+ assertEquals(CAN_I_GO_HOME, commonHeader.getSubRequestId());
Instant timestamp = Instant.now();
commonHeader.setTimeStamp(timestamp);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
copiedLcmCommonHeader.setApiVer(null);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
- commonHeader.setApiVer("Kansas");
+ commonHeader.setApiVer(KANSAS);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
- copiedLcmCommonHeader.setApiVer("Kansas");
+ copiedLcmCommonHeader.setApiVer(KANSAS);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
commonHeader.setFlags(null);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
copiedLcmCommonHeader.setOriginatorId(null);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
- commonHeader.setOriginatorId("Dorothy");
+ commonHeader.setOriginatorId(DOROTHY);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
- copiedLcmCommonHeader.setOriginatorId("Dorothy");
+ copiedLcmCommonHeader.setOriginatorId(DOROTHY);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
commonHeader.setRequestId(null);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
copiedLcmCommonHeader.setSubRequestId(null);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
- commonHeader.setSubRequestId("Can I go home?");
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
assertFalse(commonHeader.equals(copiedLcmCommonHeader));
- copiedLcmCommonHeader.setSubRequestId("Can I go home?");
+ copiedLcmCommonHeader.setSubRequestId(CAN_I_GO_HOME);
assertTrue(commonHeader.equals(copiedLcmCommonHeader));
commonHeader.setTimeStamp(null);
public class LcmRequestTest {
+ private static final String THE_EMERALD_CITY = "The Emerald City";
+ private static final String GO_TO_OZ = "Go to Oz";
+
@Test
public void testLcmRequest() {
LcmRequest request = new LcmRequest();
request.setCommonHeader(commonHeader);
assertEquals(commonHeader, request.getCommonHeader());
- request.setAction("Go to Oz");
- assertEquals("Go to Oz", request.getAction());
+ request.setAction(GO_TO_OZ);
+ assertEquals(GO_TO_OZ, request.getAction());
Map<String, String> actionIdentifiers = new HashMap<>();
actionIdentifiers.put("North", "Good Witch");
request.setActionIdentifiers(actionIdentifiers);
assertEquals(actionIdentifiers, request.getActionIdentifiers());
- request.setPayload("The Emerald City");
- assertEquals("The Emerald City", request.getPayload());
+ request.setPayload(THE_EMERALD_CITY);
+ assertEquals(THE_EMERALD_CITY, request.getPayload());
assertNotEquals(0, request.hashCode());
assertFalse(request.equals(copiedLcmRequest));
copiedLcmRequest.setAction(null);
assertTrue(request.equals(copiedLcmRequest));
- request.setAction("Go to Oz");
+ request.setAction(GO_TO_OZ);
assertFalse(request.equals(copiedLcmRequest));
- copiedLcmRequest.setAction("Go to Oz");
+ copiedLcmRequest.setAction(GO_TO_OZ);
assertTrue(request.equals(copiedLcmRequest));
request.setActionIdentifiers(null);
assertFalse(request.equals(copiedLcmRequest));
copiedLcmRequest.setPayload(null);
assertTrue(request.equals(copiedLcmRequest));
- request.setPayload("The Emerald City");
+ request.setPayload(THE_EMERALD_CITY);
assertFalse(request.equals(copiedLcmRequest));
- copiedLcmRequest.setPayload("The Emerald City");
+ copiedLcmRequest.setPayload(THE_EMERALD_CITY);
assertTrue(request.equals(copiedLcmRequest));
}
}
public class LcmResponseStatusTest {
+ private static final String THE_WONDERFUL_LAND_OF_OZ = "The wonderful land of Oz";
+
@Test
public void testResonseStatus() {
LcmResponseStatus status = new LcmResponseStatus();
status.setCode(1234);
assertEquals(1234, status.getCode());
- status.setMessage("The wonderful land of Oz");
- assertEquals("The wonderful land of Oz", status.getMessage());
+ status.setMessage(THE_WONDERFUL_LAND_OF_OZ);
+ assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getMessage());
assertEquals("ResponseStatus [code=1234, message=The wonderfu", status.toString().substring(0, 47));
assertFalse(status.equals(copiedStatus));
copiedStatus.setMessage(null);
assertTrue(status.equals(copiedStatus));
- status.setMessage("The wonderful land of Oz");
+ status.setMessage(THE_WONDERFUL_LAND_OF_OZ);
assertFalse(status.equals(copiedStatus));
- copiedStatus.setMessage("The wonderful land of Oz");
+ copiedStatus.setMessage(THE_WONDERFUL_LAND_OF_OZ);
assertTrue(status.equals(copiedStatus));
}
}
public class LcmWrapperTest {
+ private static final String YELLOW_BRICK_ROAD = "YellowBrickRoad";
+ private static final String TORNADO = "Tornado";
+ private static final String THE_EMERALD_CITY = "The Emerald City";
+ private static final String MUNCHKIN = "Munchkin";
+ private static final String VERSION19 = "19.3.9";
+
@Test
public void testLcmWrapper() {
LcmWrapper wrapper = new LcmWrapper();
assertNotNull(wrapper);
assertNotEquals(0, wrapper.hashCode());
- wrapper.setVersion("19.3.9");
- assertEquals("19.3.9", wrapper.getVersion());
+ wrapper.setVersion(VERSION19);
+ assertEquals(VERSION19, wrapper.getVersion());
- wrapper.setCambriaPartition("The Emerald City");
- assertEquals("The Emerald City", wrapper.getCambriaPartition());
+ wrapper.setCambriaPartition(THE_EMERALD_CITY);
+ assertEquals(THE_EMERALD_CITY, wrapper.getCambriaPartition());
- wrapper.setRpcName("Tornado");
- assertEquals("Tornado", wrapper.getRpcName());
+ wrapper.setRpcName(TORNADO);
+ assertEquals(TORNADO, wrapper.getRpcName());
- wrapper.setCorrelationId("YellowBrickRoad");
- assertEquals("YellowBrickRoad", wrapper.getCorrelationId());
+ wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
+ assertEquals(YELLOW_BRICK_ROAD, wrapper.getCorrelationId());
- wrapper.setType("Munchkin");
- assertEquals("Munchkin", wrapper.getType());
+ wrapper.setType(MUNCHKIN);
+ assertEquals(MUNCHKIN, wrapper.getType());
assertNotEquals(0, wrapper.hashCode());
assertFalse(wrapper.equals(copiedLcmWrapper));
copiedLcmWrapper.setVersion(null);
assertTrue(wrapper.equals(copiedLcmWrapper));
- wrapper.setVersion("19.3.9");
+ wrapper.setVersion(VERSION19);
assertFalse(wrapper.equals(copiedLcmWrapper));
- copiedLcmWrapper.setVersion("19.3.9");
+ copiedLcmWrapper.setVersion(VERSION19);
assertTrue(wrapper.equals(copiedLcmWrapper));
wrapper.setCambriaPartition(null);
assertFalse(wrapper.equals(copiedLcmWrapper));
copiedLcmWrapper.setCambriaPartition(null);
assertTrue(wrapper.equals(copiedLcmWrapper));
- wrapper.setCambriaPartition("The Emerald City");
+ wrapper.setCambriaPartition(THE_EMERALD_CITY);
assertFalse(wrapper.equals(copiedLcmWrapper));
- copiedLcmWrapper.setCambriaPartition("The Emerald City");
+ copiedLcmWrapper.setCambriaPartition(THE_EMERALD_CITY);
assertTrue(wrapper.equals(copiedLcmWrapper));
wrapper.setRpcName(null);
assertFalse(wrapper.equals(copiedLcmWrapper));
copiedLcmWrapper.setRpcName(null);
assertTrue(wrapper.equals(copiedLcmWrapper));
- wrapper.setRpcName("Tornado");
+ wrapper.setRpcName(TORNADO);
assertFalse(wrapper.equals(copiedLcmWrapper));
- copiedLcmWrapper.setRpcName("Tornado");
+ copiedLcmWrapper.setRpcName(TORNADO);
assertTrue(wrapper.equals(copiedLcmWrapper));
wrapper.setCorrelationId(null);
assertFalse(wrapper.equals(copiedLcmWrapper));
copiedLcmWrapper.setCorrelationId(null);
assertTrue(wrapper.equals(copiedLcmWrapper));
- wrapper.setCorrelationId("YellowBrickRoad");
+ wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
assertFalse(wrapper.equals(copiedLcmWrapper));
- copiedLcmWrapper.setCorrelationId("YellowBrickRoad");
+ copiedLcmWrapper.setCorrelationId(YELLOW_BRICK_ROAD);
assertTrue(wrapper.equals(copiedLcmWrapper));
wrapper.setType(null);
assertFalse(wrapper.equals(copiedLcmWrapper));
copiedLcmWrapper.setType(null);
assertTrue(wrapper.equals(copiedLcmWrapper));
- wrapper.setType("Munchkin");
+ wrapper.setType(MUNCHKIN);
assertFalse(wrapper.equals(copiedLcmWrapper));
- copiedLcmWrapper.setType("Munchkin");
+ copiedLcmWrapper.setType(MUNCHKIN);
assertTrue(wrapper.equals(copiedLcmWrapper));
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Bell Canada.
+ * 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.
}
@Override
- public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
+ public <Q, P> ClientCall<Q, P> interceptCall(MethodDescriptor<Q, P> method,
CallOptions callOptions, Channel channel) {
Key<String> authHeader = Key.of(BASIC_AUTH_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER);
- return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(channel.newCall(method, callOptions)) {
+ return new ForwardingClientCall.SimpleForwardingClientCall<Q, P>(channel.newCall(method, callOptions)) {
@Override
- public void start(Listener<RespT> responseListener, Metadata headers) {
+ public void start(Listener<P> responseListener, Metadata headers) {
headers.put(authHeader, props.getBasicAuth());
super.start(responseListener, headers);
}
private static final int MIN_USER_PORT = 1024;
private static final int MAX_USER_PORT = 65535;
- private static final String INVALID_PROP = "Invalid CDS property: ";
private static final String SERVER_PROPERTIES_TYPE = "CDS gRPC Server Properties";
// CDS carrier properties
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Bell Canada.
+ * 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.
private static class TestServerInterceptor implements ServerInterceptor {
@Override
- public <ReqT, RespT> Listener<ReqT> interceptCall(final ServerCall<ReqT, RespT> serverCall,
- final Metadata metadata,
- final ServerCallHandler<ReqT, RespT> serverCallHandler) {
+ public <Q, P> Listener<Q> interceptCall(final ServerCall<Q, P> serverCall,
+ final Metadata metadata, final ServerCallHandler<Q, P> serverCallHandler) {
return serverCallHandler.startCall(serverCall, metadata);
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Bell Canada.
+ * 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.
package org.onap.policy.cds.client;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@Test
public void testCdsProcessorGrpcClientConstructor() {
- new CdsProcessorGrpcClient(listener, props);
+ new CdsProcessorGrpcClient(listener, props).close();
}
@Test(expected = IllegalStateException.class)
public void testCdsProcessorGrpcClientConstructorFailure() {
props.setHost(null);
- new CdsProcessorGrpcClient(listener, props);
+ new CdsProcessorGrpcClient(listener, props).close();
}
@Test
assertEquals("from", notification.getFrom());
notification.setHistory(Collections.emptyList());
- assertTrue(notification.getHistory().size() == 0);
+ assertTrue(notification.getHistory().isEmpty());
notification.setMessage("message");
assertEquals("message", notification.getMessage());
package org.onap.policy.controlloop.params;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
ControlLoopParams params2 = new ControlLoopParams(params);
- assertTrue(params2.getClosedLoopControlName().equals("name"));
- assertTrue(params2.getControlLoopYaml().equals("yaml"));
- assertTrue(params2.getPolicyName().equals("name"));
- assertTrue(params2.getPolicyScope().equals("scope"));
- assertTrue(params2.getPolicyVersion().equals("1"));
+ assertEquals("name", params2.getClosedLoopControlName());
+ assertEquals("yaml", params2.getControlLoopYaml());
+ assertEquals("name", params2.getPolicyName());
+ assertEquals("scope", params2.getPolicyScope());
+ assertEquals("1", params2.getPolicyVersion());
}
}
public class ResourceInstanceTest {
+ private static final String RESOURCE = "resource";
+ private static final String INSTANCE = "instance";
+ private static final String VERSION_000 = "0.0.0";
+
@Test
public void testConstructors() {
ResourceInstance ri = new ResourceInstance();
assertTrue(ri1.equals(ri2));
assertTrue(ri2.equals(ri1));
- ri1.setResourceInstanceName("instance");
- ri1.setResourceName("resource");
+ ri1.setResourceInstanceName(INSTANCE);
+ ri1.setResourceName(RESOURCE);
ri1.setResourceInvariantUUID(UUID.randomUUID());
ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceVersion("0.0.0");
+ ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);
assertTrue(ri1.equals(ri2));
ResourceInstance ri2 = new ResourceInstance(ri1);
assertEquals(ri1.toString(), ri2.toString());
- ri1.setResourceInstanceName("instance");
- ri1.setResourceName("resource");
+ ri1.setResourceInstanceName(INSTANCE);
+ ri1.setResourceName(RESOURCE);
ri1.setResourceInvariantUUID(UUID.randomUUID());
ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceVersion("0.0.0");
+ ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);
assertEquals(ri1.toString(), ri2.toString());
ResourceInstance ri2 = new ResourceInstance(ri1);
assertEquals(ri1.hashCode(), ri2.hashCode());
- ri1.setResourceInstanceName("instance");
- ri1.setResourceName("resource");
+ ri1.setResourceInstanceName(INSTANCE);
+ ri1.setResourceName(RESOURCE);
ri1.setResourceInvariantUUID(UUID.randomUUID());
ri1.setResourceInvariantUUID(UUID.randomUUID());
- ri1.setResourceVersion("0.0.0");
+ ri1.setResourceVersion(VERSION_000);
ri1.setResourceType(ResourceType.VL);
ri2 = new ResourceInstance(ri1);
assertEquals(ri1.hashCode(), ri2.hashCode());
public class ResourceTest {
+ private static final String EQUALS_TEST = "equalsTest";
+ private static final String VERSION_111 = "1.1.1";
+
@Test
public void testConstructors() {
Resource res = new Resource();
assertTrue(r1.equals(r2));
assertTrue(r2.equals(r1));
- r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+ r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
ResourceType.VFC);
r2 = new Resource(r1);
assertTrue(r1.equals(r2));
Resource r2 = new Resource(r1);
assertEquals(r1.toString(), r2.toString());
- r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+ r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
ResourceType.VFC);
r2 = new Resource(r1);
assertEquals(r1.toString(), r2.toString());
Resource r2 = new Resource(r1);
assertEquals(r1.hashCode(), r2.hashCode());
- r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+ r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111,
ResourceType.VFC);
r2 = new Resource(r1);
assertEquals(r1.hashCode(), r2.hashCode());
public class ServiceInstanceTest {
+ private static final String SERVICE = "service";
+ private static final String INSTANCE = "instance";
+ private static final String VERSION_333 = "3.3.3";
+
@Test
public void testConstructors() {
ServiceInstance si = new ServiceInstance();
assertTrue(si1.equals(si2));
assertTrue(si2.equals(si1));
- si1.setServiceInstanceName("instance");
- si1.setServiceName("service");
+ si1.setServiceInstanceName(INSTANCE);
+ si1.setServiceName(SERVICE);
si1.setServiceInstanceUUID(UUID.randomUUID());
si1.setServiceUUID(UUID.randomUUID());
si1.setPersonaModelUUID(UUID.randomUUID());
si1.setWidgetModelUUID(UUID.randomUUID());
- si1.setWidgetModelVersion("3.3.3");
+ si1.setWidgetModelVersion(VERSION_333);
si2 = new ServiceInstance(si1);
assertTrue(si1.equals(si2));
assertTrue(si2.equals(si1));
ServiceInstance si2 = new ServiceInstance(si1);
assertEquals(si1.toString(), si2.toString());
- si1.setServiceInstanceName("instance");
- si1.setServiceName("service");
+ si1.setServiceInstanceName(INSTANCE);
+ si1.setServiceName(SERVICE);
si1.setServiceInstanceUUID(UUID.randomUUID());
si1.setServiceUUID(UUID.randomUUID());
si1.setPersonaModelUUID(UUID.randomUUID());
si1.setWidgetModelUUID(UUID.randomUUID());
- si1.setWidgetModelVersion("3.3.3");
+ si1.setWidgetModelVersion(VERSION_333);
si2 = new ServiceInstance(si1);
assertEquals(si1.toString(), si2.toString());
}
ServiceInstance si2 = new ServiceInstance(si1);
assertEquals(si1.hashCode(), si2.hashCode());
- si1.setServiceInstanceName("instance");
- si1.setServiceName("service");
+ si1.setServiceInstanceName(INSTANCE);
+ si1.setServiceName(SERVICE);
si1.setServiceInstanceUUID(UUID.randomUUID());
si1.setServiceUUID(UUID.randomUUID());
si1.setPersonaModelUUID(UUID.randomUUID());
si1.setWidgetModelUUID(UUID.randomUUID());
- si1.setWidgetModelVersion("3.3.3");
+ si1.setWidgetModelVersion(VERSION_333);
si2 = new ServiceInstance(si1);
assertEquals(si1.hashCode(), si2.hashCode());
}
public class ServiceTest {
+ private static final String EQUALS_TEST = "equalsTest";
+ private static final String VERSION_111 = "1.1.1";
+
@Test
public void testConstructors() {
Service svc = new Service();
assertTrue(s1.equals(s2));
assertTrue(s2.equals(s1));
- s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+ s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
s2 = new Service(s1);
assertTrue(s1.equals(s2));
assertTrue(s2.equals(s1));
Service s2 = new Service(s1);
assertEquals(s1.toString(), s2.toString());
- s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+ s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
s2 = new Service(s1);
assertEquals(s1.toString(), s2.toString());
}
Service s2 = new Service(s1);
assertEquals(s1.hashCode(), s2.hashCode());
- s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+ s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), EQUALS_TEST, VERSION_111);
s2 = new Service(s1);
assertEquals(s1.hashCode(), s2.hashCode());
}
// The REST manager used for processing REST calls for this Sdnc manager
private RestManager restManager;
+ @FunctionalInterface
public interface SdncCallback {
public void onCallback(SdncResponse response);
}
logger.info(body);
response.setRequestId(sdncRequest.getRequestId().toString());
- if (!response.getResponseOutput().getResponseCode().equals("200")) {
+ if (!"200".equals(response.getResponseOutput().getResponseCode())) {
logger.info(
"Sdnc Heal Restcall failed with http error code {} {}", httpDetails.first, httpDetails.second
);
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Huawei. All rights reserved.
* Modifications 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.
import com.google.gson.GsonBuilder;
public final class Serialization {
- private Serialization() {
- }
-
+
public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
.setPrettyPrinting()
.create();
+ private Serialization() {
+
+ }
}
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Huawei. All rights reserved.
* Modifications 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.
import org.junit.Test;
import org.onap.policy.sdnc.util.Serialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DemoTest {
+ private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
@Test
public void test() {
request.getHealRequest().setRequestInfo(new SdncHealRequestInfo());
request.getHealRequest().getRequestInfo().setRequestAction("request-action");
-
+
request.getHealRequest().setServiceInfo(new SdncHealServiceInfo());
request.getHealRequest().getServiceInfo().setServiceInstanceId("service-instance-01");
-
+
request.getHealRequest().setNetworkInfo(new SdncHealNetworkInfo());
request.getHealRequest().getNetworkInfo().setNetworkId("network-5555");
-
+
String body = Serialization.gsonPretty.toJson(request);
- System.out.println(body);
+ logger.info("{}", body);
SdncResponse response = new SdncResponse();
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
response.setRequestId("request-01");
response.setResponseOutput(new SdncResponseOutput());
response.getResponseOutput().setSvcRequestId("service-req-01");
response.getResponseOutput().setResponseCode("200");
response.getResponseOutput().setAckFinalIndicator("final-indicator-00");
-
+
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
response = Serialization.gsonPretty.fromJson(body, SdncResponse.class);
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
}
}
package org.onap.policy.sdnc;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.endsWith;
import java.util.UUID;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.rest.RestManager;
import org.onap.policy.rest.RestManager.Pair;
import org.onap.policy.sdnc.util.Serialization;
public class SdncManagerTest implements SdncCallback {
+ private static final String SOMEWHERE_OVER_THE_RAINBOW = "http://somewhere.over.the.rainbow";
+
+ private static final String DOROTHY = "Dorothy";
+
private RestManager mockedRestManager;
private Pair<Integer, String> httpResponsePutOk;
private SdncRequest request;
private SdncResponse response;
- @BeforeClass
- public static void beforeTestSdncManager() {
- }
-
/**
* Set up the mocked REST manager.
*/
request = new SdncRequest();
request.setRequestId(requestId);
request.setHealRequest(healRequest);
- request.setNsInstanceId("Dorothy");
+ request.setNsInstanceId(DOROTHY);
SdncResponseOutput responseDescriptor = new SdncResponseOutput();
responseDescriptor.setSvcRequestId("1234");
}
@Test
- public void testSdncInitiation() throws InterruptedException {
- try {
- new SdncManager(null, null, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals(
- "the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null",
- e.getMessage()
- );
- }
-
- try {
- new SdncManager(this, null, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals(
- "the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null",
- e.getMessage()
- );
- }
-
- try {
- new SdncManager(this, request, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals(
- "the \"url\" parameter on the SdncManager constructor may not be null",
- e.getMessage()
- );
- }
-
- new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Toto");
+ public void testSdncInitiation() {
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(null, null, null, null, null))
+ .withMessage("the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null");
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(this, null, null, null, null))
+ .withMessage("the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null");
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(this, request, null, null, null))
+ .withMessage("the \"url\" parameter on the SdncManager constructor may not be null");
+
+ new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Toto");
}
@Test
public void testSdncExecutionException() throws InterruptedException {
- SdncManager manager = new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Exception");
+ SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Exception");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Exception"), anyMap(), anyString(), anyString()))
- .thenThrow(new RuntimeException("OzException"));
+ when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Exception"), anyMap(),
+ anyString(), anyString())).thenThrow(new RuntimeException("OzException"));
managerThread.join(100);
@Test
public void testSdncExecutionNull() throws InterruptedException {
- SdncManager manager = new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Null");
+ SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Null");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Null"), anyMap(), anyString(), anyString()))
- .thenReturn(null);
+ when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Null"), anyMap(),
+ anyString(), anyString())).thenReturn(null);
managerThread.join(100);
}
@Test
public void testSdncExecutionError0() throws InterruptedException {
- SdncManager manager = new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Error0");
+ SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Error0");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("Error0"), anyMap(), anyString(), anyString()))
- .thenReturn(httpResponseErr);
+ when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Error0"), anyMap(),
+ anyString(), anyString())).thenReturn(httpResponseErr);
managerThread.join(100);
}
@Test
public void testSdncExecutionBadResponse() throws InterruptedException {
- SdncManager manager = new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "BadResponse");
+ SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "BadResponse");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
- .thenReturn(httpResponseBadResponse);
+ when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("OK"), anyMap(),
+ anyString(), anyString())).thenReturn(httpResponseBadResponse);
managerThread.join(100);
}
@Test
public void testSdncExecutionOk() throws InterruptedException {
- SdncManager manager = new SdncManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "OOK");
+ SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "OOK");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"), eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
- .thenReturn(httpResponsePutOk);
+ when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("OK"), anyMap(),
+ anyString(), anyString())).thenReturn(httpResponsePutOk);
- when(mockedRestManager.get(endsWith("1234"), eq("Dorothy"), eq("OK"), anyMap()))
+ when(mockedRestManager.get(endsWith("1234"), eq(DOROTHY), eq("OK"), anyMap()))
.thenReturn(httpResponseGetOk);
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public void setSubRequestId(String subRequestId) {
this.subRequestId = subRequestId;
}
+
/**
* Set the request track.
*
public void setRequestTrack(Map<String, String> requestTrack) {
this.requestTrack = requestTrack;
}
+
/**
* Get the request track.
*
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
/**
* Set the payload.
*
- * @param action
- * the action to set
+ * @param payload
+ * the payload to set
*/
public void setPayload(String payload) {
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public class PciCommonHeaderTest {
+ private static final String KANSAS = "Kansas";
+ private static final String CAN_I_GO_HOME = "Can I go home?";
+
@Test
public void testPciCommonHeader() {
PciCommonHeader commonHeader = new PciCommonHeader();
assertNotNull(new PciCommonHeader(commonHeader));
assertNotEquals(0, commonHeader.hashCode());
- commonHeader.setApiVer("Kansas");
- assertEquals("Kansas", commonHeader.getApiVer());
+ commonHeader.setApiVer(KANSAS);
+ assertEquals(KANSAS, commonHeader.getApiVer());
Map<String, String> flagMap = new HashMap<>();
commonHeader.setFlags(flagMap);
commonHeader.setRequestId(requestId);
assertEquals(requestId, commonHeader.getRequestId());
- commonHeader.setSubRequestId("Can I go home?");
- assertEquals("Can I go home?", commonHeader.getSubRequestId());
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
+ assertEquals(CAN_I_GO_HOME, commonHeader.getSubRequestId());
Instant timestamp = Instant.now();
commonHeader.setTimeStamp(timestamp);
assertFalse(commonHeader.equals(copiedPciCommonHeader));
copiedPciCommonHeader.setApiVer(null);
assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setApiVer("Kansas");
+ commonHeader.setApiVer(KANSAS);
assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setApiVer("Kansas");
+ copiedPciCommonHeader.setApiVer(KANSAS);
assertTrue(commonHeader.equals(copiedPciCommonHeader));
commonHeader.setFlags(null);
assertFalse(commonHeader.equals(copiedPciCommonHeader));
copiedPciCommonHeader.setSubRequestId(null);
assertTrue(commonHeader.equals(copiedPciCommonHeader));
- commonHeader.setSubRequestId("Can I go home?");
+ commonHeader.setSubRequestId(CAN_I_GO_HOME);
assertFalse(commonHeader.equals(copiedPciCommonHeader));
- copiedPciCommonHeader.setSubRequestId("Can I go home?");
+ copiedPciCommonHeader.setSubRequestId(CAN_I_GO_HOME);
assertTrue(commonHeader.equals(copiedPciCommonHeader));
commonHeader.setTimeStamp(null);
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public class PciRequestTest {
+ private static final String MODIFY = "Modify";
+
@Test
public void testPciRequest() {
PciRequest request = new PciRequest();
request.setPayload(requestPayload);
assertEquals(requestPayload, request.getPayload());
- request.setAction("Modify");
- assertEquals("Modify", request.getAction());
+ request.setAction(MODIFY);
+ assertEquals(MODIFY, request.getAction());
assertNotEquals(0, request.hashCode());
assertFalse(request.equals(copiedPciRequest));
copiedPciRequest.setAction(null);
assertTrue(request.equals(copiedPciRequest));
- request.setAction("Modify");
+ request.setAction(MODIFY);
assertFalse(request.equals(copiedPciRequest));
- copiedPciRequest.setAction("Modify");
+ copiedPciRequest.setAction(MODIFY);
assertTrue(request.equals(copiedPciRequest));
request.setPayload(null);
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
response2.setStatus(response.getStatus());
assertTrue(response.equals(response2));
- Status status = new Status();
- status.setCode(5);
- response.setStatus(status);
+ Status stat = new Status();
+ stat.setCode(5);
+ response.setStatus(stat);
response2.setStatus(new Status());
assertFalse(response.equals(response2));
}
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public class PciStatusTest {
+ private static final String THE_WONDERFUL_LAND_OF_OZ = "The wonderful land of Oz";
+
@Test
public void testResponseStatus() {
Status status = new Status();
status.setCode(1234);
assertEquals(1234, status.getCode());
- status.setValue("The wonderful land of Oz");
- assertEquals("The wonderful land of Oz", status.getValue());
+ status.setValue(THE_WONDERFUL_LAND_OF_OZ);
+ assertEquals(THE_WONDERFUL_LAND_OF_OZ, status.getValue());
assertEquals("Status [code = 1234, value = The wonderfu", status.toString().substring(0, 41));
assertFalse(status.equals(copiedStatus));
copiedStatus.setValue(null);
assertTrue(status.equals(copiedStatus));
- status.setValue("The wonderful land of Oz");
+ status.setValue(THE_WONDERFUL_LAND_OF_OZ);
assertFalse(status.equals(copiedStatus));
- copiedStatus.setValue("The wonderful land of Oz");
+ copiedStatus.setValue(THE_WONDERFUL_LAND_OF_OZ);
assertTrue(status.equals(copiedStatus));
}
}
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public class PciWrapperTest {
+ private static final String YELLOW_BRICK_ROAD = "YellowBrickRoad";
+ private static final String TORNADO = "Tornado";
+ private static final String THE_EMERALD_CITY = "The Emerald City";
+ private static final String MUNCHKIN = "Munchkin";
+ private static final String VERSION_19 = "19.3.9";
+
@Test
public void testPciWrapper() {
PciWrapper wrapper = new PciWrapper();
assertNotNull(wrapper);
assertNotEquals(0, wrapper.hashCode());
- wrapper.setVersion("19.3.9");
- assertEquals("19.3.9", wrapper.getVersion());
+ wrapper.setVersion(VERSION_19);
+ assertEquals(VERSION_19, wrapper.getVersion());
- wrapper.setCambriaPartition("The Emerald City");
- assertEquals("The Emerald City", wrapper.getCambriaPartition());
+ wrapper.setCambriaPartition(THE_EMERALD_CITY);
+ assertEquals(THE_EMERALD_CITY, wrapper.getCambriaPartition());
- wrapper.setRpcName("Tornado");
- assertEquals("Tornado", wrapper.getRpcName());
+ wrapper.setRpcName(TORNADO);
+ assertEquals(TORNADO, wrapper.getRpcName());
- wrapper.setCorrelationId("YellowBrickRoad");
- assertEquals("YellowBrickRoad", wrapper.getCorrelationId());
+ wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
+ assertEquals(YELLOW_BRICK_ROAD, wrapper.getCorrelationId());
- wrapper.setType("Munchkin");
- assertEquals("Munchkin", wrapper.getType());
+ wrapper.setType(MUNCHKIN);
+ assertEquals(MUNCHKIN, wrapper.getType());
assertNotEquals(0, wrapper.hashCode());
assertFalse(wrapper.equals(copiedPciWrapper));
copiedPciWrapper.setVersion(null);
assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setVersion("19.3.9");
+ wrapper.setVersion(VERSION_19);
assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setVersion("19.3.9");
+ copiedPciWrapper.setVersion(VERSION_19);
assertTrue(wrapper.equals(copiedPciWrapper));
wrapper.setCambriaPartition(null);
assertFalse(wrapper.equals(copiedPciWrapper));
copiedPciWrapper.setCambriaPartition(null);
assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setCambriaPartition("The Emerald City");
+ wrapper.setCambriaPartition(THE_EMERALD_CITY);
assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCambriaPartition("The Emerald City");
+ copiedPciWrapper.setCambriaPartition(THE_EMERALD_CITY);
assertTrue(wrapper.equals(copiedPciWrapper));
wrapper.setRpcName(null);
assertFalse(wrapper.equals(copiedPciWrapper));
copiedPciWrapper.setRpcName(null);
assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setRpcName("Tornado");
+ wrapper.setRpcName(TORNADO);
assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setRpcName("Tornado");
+ copiedPciWrapper.setRpcName(TORNADO);
assertTrue(wrapper.equals(copiedPciWrapper));
wrapper.setCorrelationId(null);
assertFalse(wrapper.equals(copiedPciWrapper));
copiedPciWrapper.setCorrelationId(null);
assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setCorrelationId("YellowBrickRoad");
+ wrapper.setCorrelationId(YELLOW_BRICK_ROAD);
assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setCorrelationId("YellowBrickRoad");
+ copiedPciWrapper.setCorrelationId(YELLOW_BRICK_ROAD);
assertTrue(wrapper.equals(copiedPciWrapper));
wrapper.setType(null);
assertFalse(wrapper.equals(copiedPciWrapper));
copiedPciWrapper.setType(null);
assertTrue(wrapper.equals(copiedPciWrapper));
- wrapper.setType("Munchkin");
+ wrapper.setType(MUNCHKIN);
assertFalse(wrapper.equals(copiedPciWrapper));
- copiedPciWrapper.setType("Munchkin");
+ copiedPciWrapper.setType(MUNCHKIN);
assertTrue(wrapper.equals(copiedPciWrapper));
}
}
* ================================================================================
* Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
* Modifications 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.
public class SdnrTest {
+ private static final String CORRELATION_ID = "664be3d2-6c12-4f4b-a3e7-c349acced200";
+
private static final Logger logger = LoggerFactory.getLogger(SdnrTest.class);
private static PciRequestWrapper dmaapRequest;
* Construct an SDNR Request to be Serialized
*/
dmaapRequest = new PciRequestWrapper();
- dmaapRequest.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
+ dmaapRequest.setCorrelationId(CORRELATION_ID + "-" + "1");
dmaapRequest.setRpcName("restart");
dmaapRequest.setType("request");
dmaapResponse = new PciResponseWrapper();
- dmaapResponse.setCorrelationId("664be3d2-6c12-4f4b-a3e7-c349acced200" + "-" + "1");
+ dmaapResponse.setCorrelationId(CORRELATION_ID + "-" + "1");
dmaapResponse.setRpcName("restart");
dmaapResponse.setType("response");
sdnrRequest.setAction("ModifyConfig");
PciCommonHeader commonHeader = new PciCommonHeader();
- commonHeader.setRequestId(UUID.fromString("664be3d2-6c12-4f4b-a3e7-c349acced200"));
+ commonHeader.setRequestId(UUID.fromString(CORRELATION_ID));
commonHeader.setSubRequestId("1");
sdnrRequest.setCommonHeader(commonHeader);
private String user;
private String password;
+ @FunctionalInterface
public interface SoCallback {
public void onSoResponseWrapper(SoResponseWrapper wrapper);
}
@Path("/SO")
public class SoDummyServer {
+ private static final String ONGOING = "ONGOING";
private static int postMessagesReceived = 0;
private static int putMessagesReceived = 0;
private static int statMessagesReceived = 0;
SoResponse response = ongoingRequestMap.get(nsInstanceId);
- int iterationsLeft = Integer.valueOf(response.getRequest().getRequestScope());
+ int iterationsLeft = Integer.parseInt(response.getRequest().getRequestScope());
if (--iterationsLeft > 0) {
- response.getRequest().setRequestScope(new Integer(iterationsLeft).toString());
+ response.getRequest().setRequestScope(Integer.toString(iterationsLeft));
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode()).entity(responseString).build();
}
return Response.status(400).build();
}
- SoRequest request = null;
- try {
- request = new Gson().fromJson(jsonString, SoRequest.class);
- } catch (Exception e) {
- return Response.status(400).build();
- }
+ SoRequest request = new Gson().fromJson(jsonString, SoRequest.class);
if (request == null) {
return Response.status(400).build();
if ("ReturnOnging202".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState("ONGOING");
+ response.getRequest().getRequestStatus().setRequestState(ONGOING);
response.setHttpResponseCode(202);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
if ("ReturnOnging200".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState("ONGOING");
+ response.getRequest().getRequestStatus().setRequestState(ONGOING);
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
if ("ReturnBadAfterWait".equals(request.getRequestType())) {
ongoingRequestMap.put(request.getRequestId().toString(), response);
- response.getRequest().getRequestStatus().setRequestState("ONGOING");
+ response.getRequest().getRequestStatus().setRequestState(ONGOING);
response.setHttpResponseCode(200);
String responseString = new Gson().toJson(response, SoResponse.class);
return Response.status(response.getHttpResponseCode())
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URI;
import java.util.UUID;
import java.util.concurrent.Future;
-import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.onap.policy.so.SoManager.SoCallback;
public class SoManagerTest implements SoCallback {
+ private static final String LOCALHOST_99999999 = "http:/localhost:99999999";
+ private static final String CITIZEN = "citizen";
+ private static final String RETURN_ONGING202 = "ReturnOnging202";
+ private static final String RETURN_ONGING200 = "ReturnOnging200";
+ private static final String RETURN_FAILED = "ReturnFailed";
+ private static final String RETURN_COMPLETED = "ReturnCompleted";
+ private static final String RETURN_BAD_JSON = "ReturnBadJson";
+ private static final String RETURN_BAD_AFTER_WAIT = "ReturnBadAfterWait";
+ private static final String ONGOING = "ONGOING";
+ private static final String FAILED = "FAILED";
+ private static final String COMPLETE = "COMPLETE";
+ private static final String DATE1 = "2018-03-23 16:31";
+ private static final String SERVICE_INSTANTIATION_V7 = "/serviceInstantiation/v7";
private static final String BASE_URI = "http://localhost:46553/TestSOManager";
private static final String BASE_SO_URI = BASE_URI + "/SO";
private static HttpServer server;
}
@AfterClass
- public static void tearDown() throws Exception {
+ public static void tearDown() {
server.shutdown();
}
@Test
- public void testGrizzlyServer() throws ClientProtocolException, IOException {
- CloseableHttpClient httpclient = HttpClients.createDefault();
- HttpGet httpGet = new HttpGet("http://localhost:46553/TestSOManager/SO/Stats");
- CloseableHttpResponse response = httpclient.execute(httpGet);
-
- String returnBody = EntityUtils.toString(response.getEntity(), "UTF-8");
- assertTrue(returnBody.matches("^\\{\"GET\": [0-9]*,\"STAT\": [0-9]*,\"POST\": [0-9]*,\"PUT\": [0-9]*,"
- + "\"DELETE\": [0-9]*\\}$"));
+ public void testGrizzlyServer() throws IOException {
+ try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
+ HttpGet httpGet = new HttpGet("http://localhost:46553/TestSOManager/SO/Stats");
+ CloseableHttpResponse response = httpclient.execute(httpGet);
+
+ String returnBody = EntityUtils.toString(response.getEntity(), "UTF-8");
+ assertTrue(returnBody.matches("^\\{\"GET\": [0-9]*,\"STAT\": [0-9]*,\"POST\": [0-9]*,\"PUT\": [0-9]*,"
+ + "\"DELETE\": [0-9]*\\}$"));
+ }
}
@Test
- public void testServiceInstantiation() throws IOException {
+ public void testServiceInstantiation() {
SoManager manager = new SoManager(null, null, null);
assertNotNull(manager);
manager.setRestGetTimeout(100);
- SoResponse response = manager.createModuleInstance("http:/localhost:99999999", BASE_SO_URI, "sean",
- "citizen", null);
+ SoResponse response = manager.createModuleInstance(LOCALHOST_99999999, BASE_SO_URI, "sean",
+ CITIZEN, null);
assertNull(response);
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", null);
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, null);
assertNull(response);
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", new SoRequest());
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, new SoRequest());
assertNull(response);
SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
- request.setRequestType("ReturnBadJson");
- request.setStartTime("2018-03-23 16:31");
+ request.setRequestType(RETURN_BAD_JSON);
+ request.setStartTime(DATE1);
request.setRequestStatus(new SoRequestStatus());
- request.getRequestStatus().setRequestState("ONGOING");
+ request.getRequestStatus().setRequestState(ONGOING);
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNull(response);
- request.setRequestType("ReturnCompleted");
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_COMPLETED);
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNotNull(response);
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnFailed");
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_FAILED);
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNotNull(response);
- assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
+ assertEquals(FAILED, response.getRequest().getRequestStatus().getRequestState());
// Use scope to set the number of iterations we'll wait for
- request.setRequestType("ReturnOnging200");
- request.setRequestScope(new Integer(10).toString());
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_ONGING200);
+ request.setRequestScope("10");
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNotNull(response);
assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(20).toString());
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("20");
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNotNull(response);
assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
// Test timeout after 20 attempts for a response
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(21).toString());
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("21");
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNull(response);
// Test bad response after 3 attempts for a response
- request.setRequestType("ReturnBadAfterWait");
- request.setRequestScope(new Integer(3).toString());
- response = manager.createModuleInstance(BASE_SO_URI + "/serviceInstantiation/v7", BASE_SO_URI, "sean",
- "citizen", request);
+ request.setRequestType(RETURN_BAD_AFTER_WAIT);
+ request.setRequestScope("3");
+ response = manager.createModuleInstance(BASE_SO_URI + SERVICE_INSTANTIATION_V7, BASE_SO_URI, "sean",
+ CITIZEN, request);
assertNull(response);
}
@Test
- public void testVfModuleCreation() throws IOException {
- SoManager manager = new SoManager("http:/localhost:99999999", "sean", "citizen");
+ public void testVfModuleCreation() throws Exception {
+ SoManager manager = new SoManager(LOCALHOST_99999999, "sean", CITIZEN);
assertNotNull(manager);
manager.setRestGetTimeout(100);
soRequest.setOperationType(SoOperationType.SCALE_OUT);
Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ SoResponse response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
- manager = new SoManager(BASE_SO_URI, "sean", "citizen");
+ manager = new SoManager(BASE_SO_URI, "sean", CITIZEN);
manager.setRestGetTimeout(100);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), soRequest);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
- request.setRequestType("ReturnBadJson");
- request.setStartTime("2018-03-23 16:31");
+ request.setRequestType(RETURN_BAD_JSON);
+ request.setStartTime(DATE1);
request.setRequestStatus(new SoRequestStatus());
- request.getRequestStatus().setRequestState("ONGOING");
+ request.getRequestStatus().setRequestState(ONGOING);
request.setOperationType(SoOperationType.SCALE_OUT);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
- request.setRequestType("ReturnCompleted");
+ request.setRequestType(RETURN_COMPLETED);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnFailed");
+ request.setRequestType(RETURN_FAILED);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(FAILED, response.getRequest().getRequestStatus().getRequestState());
// Use scope to set the number of iterations we'll wait for
- request.setRequestType("ReturnOnging200");
- request.setRequestScope(new Integer(10).toString());
+ request.setRequestType(RETURN_ONGING200);
+ request.setRequestScope("10");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertNotNull(response.getRequest());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(20).toString());
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("20");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertNotNull(response.getRequest());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
// Test timeout after 20 attempts for a response
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(21).toString());
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("21");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
// Test bad response after 3 attempts for a response
- request.setRequestType("ReturnBadAfterWait");
- request.setRequestScope(new Integer(3).toString());
+ request.setRequestType(RETURN_BAD_AFTER_WAIT);
+ request.setRequestScope("3");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
}
@Test
- public void testVfModuleDeletion() {
- SoManager manager = new SoManager("http:/localhost:99999999", "sean", "citizen");
+ public void testVfModuleDeletion() throws Exception {
+ SoManager manager = new SoManager(LOCALHOST_99999999, "sean", CITIZEN);
assertNotNull(manager);
manager.setRestGetTimeout(100);
soRequest.setOperationType(SoOperationType.DELETE_VF_MODULE);
Future<SoResponse> asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this,
UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ SoResponse response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
- manager = new SoManager(BASE_SO_URI, "sean", "citizen");
+ manager = new SoManager(BASE_SO_URI, "sean", CITIZEN);
manager.setRestGetTimeout(100);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), soRequest);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
SoRequest request = new SoRequest();
request.setRequestId(UUID.randomUUID());
request.setRequestScope("Test");
- request.setRequestType("ReturnBadJson");
- request.setStartTime("2018-03-23 16:31");
+ request.setRequestType(RETURN_BAD_JSON);
+ request.setStartTime(DATE1);
request.setRequestStatus(new SoRequestStatus());
- request.getRequestStatus().setRequestState("ONGOING");
+ request.getRequestStatus().setRequestState(ONGOING);
request.setOperationType(SoOperationType.DELETE_VF_MODULE);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
- request.setRequestType("ReturnCompleted");
+ request.setRequestType(RETURN_COMPLETED);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnFailed");
+ request.setRequestType(RETURN_FAILED);
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals("FAILED", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(FAILED, response.getRequest().getRequestStatus().getRequestState());
// Use scope to set the number of iterations we'll wait for
- request.setRequestType("ReturnOnging200");
- request.setRequestScope(new Integer(10).toString());
+ request.setRequestType(RETURN_ONGING200);
+ request.setRequestScope("10");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertNotNull(response.getRequest());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(20).toString());
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("20");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertNotNull(response.getRequest());
- assertEquals("COMPLETE", response.getRequest().getRequestStatus().getRequestState());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertNotNull(response.getRequest());
+ assertEquals(COMPLETE, response.getRequest().getRequestStatus().getRequestState());
// Test timeout after 20 attempts for a response
- request.setRequestType("ReturnOnging202");
- request.setRequestScope(new Integer(21).toString());
+ request.setRequestType(RETURN_ONGING202);
+ request.setRequestScope("21");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
// Test bad response after 3 attempts for a response
- request.setRequestType("ReturnBadAfterWait");
- request.setRequestScope(new Integer(3).toString());
+ request.setRequestType(RETURN_BAD_AFTER_WAIT);
+ request.setRequestScope("3");
asyncRestCallFuture = manager.asyncSoRestCall(UUID.randomUUID().toString(), this, UUID.randomUUID().toString(),
UUID.randomUUID().toString(), UUID.randomUUID().toString(), request);
- try {
- SoResponse response = asyncRestCallFuture.get();
- assertEquals(999, response.getHttpResponseCode());
- } catch (Exception e) {
- fail("test should not throw an exception");
- }
+ response = asyncRestCallFuture.get();
+ assertEquals(999, response.getHttpResponseCode());
}
@Override
* so
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.so;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import org.junit.Test;
public void testConstructor() {
SoRequestInfo obj = new SoRequestInfo();
- assertTrue(obj.getBillingAccountNumber() == null);
- assertTrue(obj.getCallbackUrl() == null);
- assertTrue(obj.getCorrelator() == null);
- assertTrue(obj.getInstanceName() == null);
- assertTrue(obj.getOrderNumber() == null);
- assertTrue(obj.getOrderVersion() == null);
- assertTrue(obj.getProductFamilyId() == null);
- assertTrue(obj.getRequestorId() == null);
- assertTrue(obj.getSource() == null);
- assertTrue(obj.isSuppressRollback() == false);
+ assertNull(obj.getBillingAccountNumber());
+ assertNull(obj.getCallbackUrl());
+ assertNull(obj.getCorrelator());
+ assertNull(obj.getInstanceName());
+ assertNull(obj.getOrderNumber());
+ assertNull(obj.getOrderVersion());
+ assertNull(obj.getProductFamilyId());
+ assertNull(obj.getRequestorId());
+ assertNull(obj.getSource());
+ assertFalse(obj.isSuppressRollback());
}
@Test
public class SoResponseWrapperTest {
+ private static final String REQ_ID = "reqID";
+
@Test
public void testConstructor() {
SoResponse response = new SoResponse();
- SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
+ SoResponseWrapper obj = new SoResponseWrapper(response, REQ_ID);
assertEquals(response, obj.getSoResponse());
- assertEquals("reqID", obj.getRequestId());
+ assertEquals(REQ_ID, obj.getRequestId());
}
@Test
public void testSetGet() {
SoResponse response = new SoResponse();
- SoResponseWrapper obj = new SoResponseWrapper(response, "reqID");
+ SoResponseWrapper obj = new SoResponseWrapper(response, REQ_ID);
SoResponse response2 = new SoResponse();
response2.setHttpResponseCode(2008);
// The REST manager used for processing REST calls for this VFC manager
private RestManager restManager;
+ @FunctionalInterface
public interface VfcCallback {
void onResponse(VfcResponse responseError);
}
}
Thread.sleep(20000);
}
- if ((attemptsLeft <= 0) && (responseGet != null) && (responseGet.getResponseDescriptor() != null)
- && (responseGet.getResponseDescriptor().getStatus() != null)
- && (!responseGet.getResponseDescriptor().getStatus().isEmpty())) {
+ boolean isTimeout = (attemptsLeft <= 0) && (responseGet != null)
+ && (responseGet.getResponseDescriptor() != null);
+ isTimeout = isTimeout && (responseGet.getResponseDescriptor().getStatus() != null)
+ && (!responseGet.getResponseDescriptor().getStatus().isEmpty());
+ if (isTimeout) {
logger.debug("VFC timeout. Status: ({})", responseGet.getResponseDescriptor().getStatus());
this.callback.onResponse(responseGet);
}
package org.onap.policy.vfc;
import java.util.LinkedList;
-
import org.junit.Test;
import org.onap.policy.vfc.util.Serialization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DemoTest {
+ private static final Logger logger = LoggerFactory.getLogger(DemoTest.class);
@Test
public void test() {
request.getHealRequest().getAdditionalParams().getActionInfo().setVmname("xgw-smp11");
String body = Serialization.gsonPretty.toJson(request);
- System.out.println(body);
+ logger.info("{}", body);
VfcResponse response = new VfcResponse();
response.setJobId("1");
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
response.setResponseDescriptor(new VfcResponseDescriptor());
response.getResponseDescriptor().setProgress("40");
response.getResponseDescriptor().setErrorCode(null);
response.getResponseDescriptor().setResponseId("42");
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
VfcResponseDescriptor responseDescriptor = new VfcResponseDescriptor();
responseDescriptor.setProgress("20");
response.getResponseDescriptor().getResponseHistoryList().add(responseDescriptor);
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
response = Serialization.gsonPretty.fromJson(body, VfcResponse.class);
body = Serialization.gsonPretty.toJson(response);
- System.out.println(body);
+ logger.info("{}", body);
}
}
package org.onap.policy.vfc;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.endsWith;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.rest.RestManager;
public class VfcManagerTest implements VfcCallback {
+ private static final String SOME_URL = "http://somewhere.over.the.rainbow";
+
+ private static final String DOROTHY = "Dorothy";
+
private RestManager mockedRestManager;
private Pair<Integer, String> httpResponsePutOk;
final UUID requestId = UUID.randomUUID();
request = new VfcRequest();
request.setHealRequest(healRequest);
- request.setNsInstanceId("Dorothy");
+ request.setNsInstanceId(DOROTHY);
request.setRequestId(requestId);
List<VfcResponseDescriptor> responseHistoryList = new ArrayList<>();;
@Test
public void testVfcInitiation() {
- try {
- new VfcManager(null, null, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals("the parameters \"cb\" and \"request\" on the VfcManager constructor may not be null",
- e.getMessage());
- }
-
- try {
- new VfcManager(this, null, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals("the parameters \"cb\" and \"request\" on the VfcManager constructor may not be null",
- e.getMessage());
- }
-
- try {
- new VfcManager(this, request, null, null, null);
- fail("test should throw an exception here");
- }
- catch (IllegalArgumentException e) {
- assertEquals("the \"url\" parameter on the VfcManager constructor may not be null",
- e.getMessage());
- }
-
- new VfcManager(this, request, "http://somewhere.over.the.rainbow", null, null);
-
- new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Toto");
+ assertThatIllegalArgumentException().isThrownBy(() -> new VfcManager(null, null, null, null, null)).withMessage(
+ "the parameters \"cb\" and \"request\" on the VfcManager constructor may not be null");
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new VfcManager(this, null, null, null, null)).withMessage(
+ "the parameters \"cb\" and \"request\" on the VfcManager constructor may not be null");
+
+ assertThatIllegalArgumentException().isThrownBy(() -> new VfcManager(this, request, null, null, null))
+ .withMessage("the \"url\" parameter on the VfcManager constructor may not be null");
+
+ new VfcManager(this, request, SOME_URL, null, null);
+
+ new VfcManager(this, request, SOME_URL, DOROTHY, "Toto");
}
@Test
public void testVfcExecutionException() throws InterruptedException {
- VfcManager manager = new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Exception");
+ VfcManager manager = new VfcManager(this, request, SOME_URL, DOROTHY, "Exception");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
when(mockedRestManager.post(
- startsWith("http://somewhere.over.the.rainbow"),
- eq("Dorothy"),
+ startsWith(SOME_URL),
+ eq(DOROTHY),
eq("Exception"),
anyMap(),
anyString(),
@Test
public void testVfcExecutionNull() throws InterruptedException {
- VfcManager manager = new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Null");
+ VfcManager manager = new VfcManager(this, request, SOME_URL, DOROTHY, "Null");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"),
- eq("Dorothy"), eq("Null"), anyMap(), anyString(), anyString()))
+ when(mockedRestManager.post(startsWith(SOME_URL),
+ eq(DOROTHY), eq("Null"), anyMap(), anyString(), anyString()))
.thenReturn(null);
managerThread.join();
@Test
public void testVfcExecutionError0() throws InterruptedException {
- VfcManager manager = new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Error0");
+ VfcManager manager = new VfcManager(this, request, SOME_URL, DOROTHY, "Error0");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"),
- eq("Dorothy"), eq("Error0"), anyMap(), anyString(), anyString()))
+ when(mockedRestManager.post(startsWith(SOME_URL),
+ eq(DOROTHY), eq("Error0"), anyMap(), anyString(), anyString()))
.thenReturn(httpResponseErr);
managerThread.join();
@Test
public void testVfcExecutionBadResponse() throws InterruptedException {
- VfcManager manager = new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "BadResponse");
+ VfcManager manager = new VfcManager(this, request, SOME_URL, DOROTHY, "BadResponse");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"),
- eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
+ when(mockedRestManager.post(startsWith(SOME_URL),
+ eq(DOROTHY), eq("OK"), anyMap(), anyString(), anyString()))
.thenReturn(httpResponseBadResponse);
managerThread.join();
@Test
public void testVfcExecutionOk() throws InterruptedException {
- VfcManager manager = new VfcManager(this, request, "http://somewhere.over.the.rainbow", "Dorothy", "Ok");
+ VfcManager manager = new VfcManager(this, request, SOME_URL, DOROTHY, "Ok");
manager.setRestManager(mockedRestManager);
Thread managerThread = new Thread(manager);
managerThread.start();
- when(mockedRestManager.post(startsWith("http://somewhere.over.the.rainbow"),
- eq("Dorothy"), eq("OK"), anyMap(), anyString(), anyString()))
+ when(mockedRestManager.post(startsWith(SOME_URL),
+ eq(DOROTHY), eq("OK"), anyMap(), anyString(), anyString()))
.thenReturn(httpResponsePutOk);
- when(mockedRestManager.get(endsWith("1234"), eq("Dorothy"), eq("OK"), anyMap()))
+ when(mockedRestManager.get(endsWith("1234"), eq(DOROTHY), eq("OK"), anyMap()))
.thenReturn(httpResponseGetOk);
managerThread.join();
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-
+import org.apache.commons.lang3.StringUtils;
import org.jgrapht.DirectedGraph;
import org.jgrapht.graph.ClassBasedEdgeFactory;
import org.jgrapht.graph.DefaultEdge;
private static final String OPERATION_POLICY = "Operation Policy ";
private static final long serialVersionUID = 1L;
private static final Logger LOGGER = LoggerFactory.getLogger(ControlLoopCompiler.class.getName());
-
+
/**
* Compiles the policy from an object.
*/
- public static ControlLoopPolicy compile(ControlLoopPolicy policy,
+ public static ControlLoopPolicy compile(ControlLoopPolicy policy,
ControlLoopCompilerCallback callback) throws CompilerException {
//
// Ensure the control loop is sane
// Validate the policies
//
validatePolicies(policy, callback);
-
+
return policy;
}
-
+
/**
* Compiles the policy from an input stream.
- *
+ *
* @param yamlSpecification the yaml input stream
* @param callback method to callback during compilation
* @return Control Loop object
* @throws CompilerException throws any compile exception found
*/
- public static ControlLoopPolicy compile(InputStream yamlSpecification,
+ public static ControlLoopPolicy compile(InputStream yamlSpecification,
ControlLoopCompilerCallback callback) throws CompilerException {
Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
Object obj = yaml.load(yamlSpecification);
}
return ControlLoopCompiler.compile((ControlLoopPolicy) obj, callback);
}
-
- private static void validateControlLoop(ControlLoop controlLoop,
+
+ private static void validateControlLoop(ControlLoop controlLoop,
ControlLoopCompilerCallback callback) throws CompilerException {
if (controlLoop == null && callback != null) {
callback.onError("controlLoop cannot be null");
}
if (controlLoop != null) {
- if ((controlLoop.getControlLoopName() == null || controlLoop.getControlLoopName().length() < 1)
- && callback != null) {
+ if (StringUtils.isEmpty(controlLoop.getControlLoopName()) && callback != null) {
callback.onError("Missing controlLoopName");
}
if ((!controlLoop.getVersion().contentEquals(ControlLoop.getCompilerVersion())) && callback != null) {
callback.onError("Unsupported version for this compiler");
}
- if (controlLoop.getTrigger_policy() == null || controlLoop.getTrigger_policy().length() < 1) {
+ if (StringUtils.isEmpty(controlLoop.getTrigger_policy())) {
throw new CompilerException("trigger_policy is not valid");
}
}
}
- private static void validatePolicies(ControlLoopPolicy policy,
+ private static void validatePolicies(ControlLoopPolicy policy,
ControlLoopCompilerCallback callback) throws CompilerException {
if (policy == null) {
throw new CompilerException("policy cannot be null");
}
if (policy.getPolicies() == null) {
- callback.onWarning("controlLoop is an open loop.");
+ callback.onWarning("controlLoop is an open loop.");
} else {
//
// For this version we can use a directed multigraph, in the future we may not be able to
//
- DirectedGraph<NodeWrapper, LabeledEdge> graph =
- new DirectedMultigraph<>(new ClassBasedEdgeFactory<NodeWrapper,
+ DirectedGraph<NodeWrapper, LabeledEdge> graph =
+ new DirectedMultigraph<>(new ClassBasedEdgeFactory<NodeWrapper,
LabeledEdge>(LabeledEdge.class));
//
// Check to see if the trigger Event is for OpenLoop, we do so by
FinalResultNodeWrapper finalFailure = new FinalResultNodeWrapper(FinalResult.FINAL_FAILURE);
FinalResultNodeWrapper finalFailureTimeout = new FinalResultNodeWrapper(FinalResult.FINAL_FAILURE_TIMEOUT);
FinalResultNodeWrapper finalFailureRetries = new FinalResultNodeWrapper(FinalResult.FINAL_FAILURE_RETRIES);
- FinalResultNodeWrapper finalFailureException =
+ FinalResultNodeWrapper finalFailureException =
new FinalResultNodeWrapper(FinalResult.FINAL_FAILURE_EXCEPTION);
FinalResultNodeWrapper finalFailureGuard = new FinalResultNodeWrapper(FinalResult.FINAL_FAILURE_GUARD);
graph.addVertex(finalSuccess);
if (node == null) {
continue;
}
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getSuccess(), finalSuccess,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getSuccess(), finalSuccess,
PolicyResult.SUCCESS, node);
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure(), finalFailure,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure(), finalFailure,
PolicyResult.FAILURE, node);
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_timeout(), finalFailureTimeout,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_timeout(), finalFailureTimeout,
PolicyResult.FAILURE_TIMEOUT, node);
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_retries(), finalFailureRetries,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_retries(), finalFailureRetries,
PolicyResult.FAILURE_RETRIES, node);
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_exception(), finalFailureException,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_exception(), finalFailureException,
PolicyResult.FAILURE_EXCEPTION, node);
- addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_guard(), finalFailureGuard,
+ addEdge(graph, mapNodes, operPolicy.getId(), operPolicy.getFailure_guard(), finalFailureGuard,
PolicyResult.FAILURE_GUARD, node);
}
validateNodesAndEdges(graph, callback);
- }
+ }
}
-
- private static void validateOpenLoopPolicy(ControlLoopPolicy policy, FinalResult triggerResult,
+
+ private static void validateOpenLoopPolicy(ControlLoopPolicy policy, FinalResult triggerResult,
ControlLoopCompilerCallback callback) throws CompilerException {
//
// Ensure they didn't use some other FinalResult code
//
if (triggerResult != FinalResult.FINAL_OPENLOOP) {
- throw new CompilerException("Unexpected Final Result for trigger_policy, should only be "
+ throw new CompilerException("Unexpected Final Result for trigger_policy, should only be "
+ FinalResult.FINAL_OPENLOOP.toString() + " or a valid Policy ID");
}
//
callback.onWarning("Open Loop policy contains policies. The policies will never be invoked.");
}
}
-
- private static void validatePoliciesContainTriggerPolicyAndCombinedTimeoutIsOk(ControlLoopPolicy policy,
+
+ private static void validatePoliciesContainTriggerPolicyAndCombinedTimeoutIsOk(ControlLoopPolicy policy,
ControlLoopCompilerCallback callback) throws CompilerException {
int sum = 0;
boolean triggerPolicyFound = false;
if (policy.getControlLoop().getTimeout().intValue() < sum && callback != null) {
callback.onError("controlLoop overall timeout is less than the sum of operational policy timeouts.");
}
-
+
if (!triggerPolicyFound) {
- throw new CompilerException("Unexpected value for trigger_policy, should only be "
+ throw new CompilerException("Unexpected value for trigger_policy, should only be "
+ FinalResult.FINAL_OPENLOOP.toString() + " or a valid Policy ID");
}
}
-
- private static Map<Policy, PolicyNodeWrapper> addPoliciesAsNodes(ControlLoopPolicy policy,
- DirectedGraph<NodeWrapper, LabeledEdge> graph, TriggerNodeWrapper triggerNode,
+
+ private static Map<Policy, PolicyNodeWrapper> addPoliciesAsNodes(ControlLoopPolicy policy,
+ DirectedGraph<NodeWrapper, LabeledEdge> graph, TriggerNodeWrapper triggerNode,
ControlLoopCompilerCallback callback) {
Map<Policy, PolicyNodeWrapper> mapNodes = new HashMap<>();
for (Policy operPolicy : policy.getPolicies()) {
}
return mapNodes;
}
-
+
private static void addEdge(DirectedGraph<NodeWrapper, LabeledEdge> graph, Map<Policy, PolicyNodeWrapper> mapNodes,
- String policyId, String connectedPolicy,
- FinalResultNodeWrapper finalResultNodeWrapper,
+ String policyId, String connectedPolicy,
+ FinalResultNodeWrapper finalResultNodeWrapper,
PolicyResult policyResult, NodeWrapper node) throws CompilerException {
FinalResult finalResult = FinalResult.toResult(finalResultNodeWrapper.getId());
if (FinalResult.isResult(connectedPolicy, finalResult)) {
- graph.addEdge(node, finalResultNodeWrapper, new LabeledEdge(node, finalResultNodeWrapper,
+ graph.addEdge(node, finalResultNodeWrapper, new LabeledEdge(node, finalResultNodeWrapper,
new FinalResultEdgeWrapper(finalResult)));
} else {
PolicyNodeWrapper toNode = findPolicyNode(mapNodes, connectedPolicy);
if (toNode == null) {
- throw new CompilerException(OPERATION_POLICY + policyId + " is connected to unknown policy "
+ throw new CompilerException(OPERATION_POLICY + policyId + " is connected to unknown policy "
+ connectedPolicy);
} else {
graph.addEdge(node, toNode, new LabeledEdge(node, toNode, new PolicyResultEdgeWrapper(policyResult)));
}
}
}
-
- private static void validateNodesAndEdges(DirectedGraph<NodeWrapper, LabeledEdge> graph,
+
+ private static void validateNodesAndEdges(DirectedGraph<NodeWrapper, LabeledEdge> graph,
ControlLoopCompilerCallback callback) throws CompilerException {
for (NodeWrapper node : graph.vertexSet()) {
if (node instanceof TriggerNodeWrapper) {
}
}
}
-
- private static void validateTriggerNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
+
+ private static void validateTriggerNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
NodeWrapper node) throws CompilerException {
if (LOGGER.isDebugEnabled()) {
LOGGER.info("Trigger Node {}", node);
throw new CompilerException("The event trigger should only go to ONE node");
}
}
-
- private static void validateFinalResultNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
+
+ private static void validateFinalResultNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
NodeWrapper node) throws CompilerException {
if (LOGGER.isDebugEnabled()) {
LOGGER.info("FinalResult Node {}", node);
throw new CompilerException("FinalResult nodes should never have any out edges.");
}
}
-
- private static void validatePolicyNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
+
+ private static void validatePolicyNodeWrapper(DirectedGraph<NodeWrapper, LabeledEdge> graph,
NodeWrapper node, ControlLoopCompilerCallback callback) throws CompilerException {
if (LOGGER.isDebugEnabled()) {
LOGGER.info("Policy Node {}", node);
throw new CompilerException("Policy node should ALWAYS have 6 out degrees.");
}
//
- // All Policy Nodes should have at least 1 in degrees
- //
+ // All Policy Nodes should have at least 1 in degrees
+ //
if (graph.inDegreeOf(node) == 0 && callback != null) {
callback.onWarning("Policy " + node.getId() + " is not reachable.");
}
}
-
+
private static boolean okToAdd(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = isPolicyIdOk(operPolicy, callback);
if (! isActorOk(operPolicy, callback)) {
}
return isOk;
}
-
+
private static boolean isPolicyIdOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
if (operPolicy.getId() == null || operPolicy.getId().length() < 1) {
}
return isOk;
}
-
+
private static boolean isActorOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
if (operPolicy.getActor() == null) {
}
return isOk;
}
-
+
private static boolean isRecipeOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
if (operPolicy.getRecipe() == null) {
}
//
// NOTE: We need a way to find the acceptable recipe values (either Enum or a database that has these)
- //
+ //
ImmutableMap<String, List<String>> recipes = new ImmutableMap.Builder<String, List<String>>()
.put("APPC", ImmutableList.of("Restart", "Rebuild", "Migrate", "ModifyConfig"))
.put("SDNC", ImmutableList.of("Reroute"))
.put("VFC", ImmutableList.of("Restart"))
.build();
//
- if (operPolicy.getRecipe() != null
- && (!recipes.getOrDefault(operPolicy.getActor(),
+ if (operPolicy.getRecipe() != null
+ && (!recipes.getOrDefault(operPolicy.getActor(),
Collections.emptyList()).contains(operPolicy.getRecipe()))) {
if (callback != null) {
callback.onError("Policy recipe is invalid");
}
return isOk;
}
-
+
private static boolean isTargetOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
if (operPolicy.getTarget() == null) {
}
isOk = false;
}
- if (operPolicy.getTarget() != null
- && operPolicy.getTarget().getType() != TargetType.VM
- && operPolicy.getTarget().getType() != TargetType.VFC
+ if (operPolicy.getTarget() != null
+ && operPolicy.getTarget().getType() != TargetType.VM
+ && operPolicy.getTarget().getType() != TargetType.VFC
&& operPolicy.getTarget().getType() != TargetType.PNF) {
if (callback != null) {
callback.onError("Policy target is invalid");
}
return isOk;
}
-
+
private static boolean arePolicyResultsOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
//
// Check that policy results are connected to either default final * or another policy
}
return isOk;
}
-
+
private static boolean isSuccessPolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getSuccess()) != null
+ if (FinalResult.toResult(operPolicy.getSuccess()) != null
&& !operPolicy.getSuccess().equals(FinalResult.FINAL_SUCCESS.toString())) {
if (callback != null) {
callback.onError("Policy success is neither another policy nor FINAL_SUCCESS");
}
return isOk;
}
-
+
private static boolean isFailurePolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getFailure()) != null
+ if (FinalResult.toResult(operPolicy.getFailure()) != null
&& !operPolicy.getFailure().equals(FinalResult.FINAL_FAILURE.toString())) {
if (callback != null) {
callback.onError("Policy failure is neither another policy nor FINAL_FAILURE");
}
return isOk;
}
-
+
private static boolean isFailureRetriesPolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getFailure_retries()) != null
+ if (FinalResult.toResult(operPolicy.getFailure_retries()) != null
&& !operPolicy.getFailure_retries().equals(FinalResult.FINAL_FAILURE_RETRIES.toString())) {
if (callback != null) {
callback.onError("Policy failure retries is neither another policy nor FINAL_FAILURE_RETRIES");
}
return isOk;
}
-
+
private static boolean isFailureTimeoutPolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getFailure_timeout()) != null
+ if (FinalResult.toResult(operPolicy.getFailure_timeout()) != null
&& !operPolicy.getFailure_timeout().equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString())) {
if (callback != null) {
callback.onError("Policy failure timeout is neither another policy nor FINAL_FAILURE_TIMEOUT");
}
return isOk;
}
-
+
private static boolean isFailureExceptionPolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getFailure_exception()) != null
+ if (FinalResult.toResult(operPolicy.getFailure_exception()) != null
&& !operPolicy.getFailure_exception().equals(FinalResult.FINAL_FAILURE_EXCEPTION.toString())) {
if (callback != null) {
callback.onError("Policy failure exception is neither another policy nor FINAL_FAILURE_EXCEPTION");
}
return isOk;
}
-
+
private static boolean isFailureGuardPolicyResultOk(Policy operPolicy, ControlLoopCompilerCallback callback) {
boolean isOk = true;
- if (FinalResult.toResult(operPolicy.getFailure_guard()) != null
+ if (FinalResult.toResult(operPolicy.getFailure_guard()) != null
&& !operPolicy.getFailure_guard().equals(FinalResult.FINAL_FAILURE_GUARD.toString())) {
if (callback != null) {
callback.onError("Policy failure guard is neither another policy nor FINAL_FAILURE_GUARD");
}
return null;
}
-
+
@FunctionalInterface
private interface NodeWrapper extends Serializable {
public String getId();
}
-
+
private static class TriggerNodeWrapper implements NodeWrapper {
private static final long serialVersionUID = -187644087811478349L;
private String closedLoopControlName;
-
+
public TriggerNodeWrapper(String closedLoopControlName) {
this.closedLoopControlName = closedLoopControlName;
}
public String getId() {
return closedLoopControlName;
}
-
+
}
-
+
private static class FinalResultNodeWrapper implements NodeWrapper {
private static final long serialVersionUID = 8540008796302474613L;
private FinalResult result;
return result.toString();
}
}
-
+
private static class PolicyNodeWrapper implements NodeWrapper {
private static final long serialVersionUID = 8170162175653823082L;
private transient Policy policy;
-
+
public PolicyNodeWrapper(Policy operPolicy) {
this.policy = operPolicy;
}
return policy.getId();
}
}
-
+
@FunctionalInterface
private interface EdgeWrapper extends Serializable {
public String getId();
-
+
}
-
+
private static class TriggerEdgeWrapper implements EdgeWrapper {
private static final long serialVersionUID = 2678151552623278863L;
private String trigger;
-
+
public TriggerEdgeWrapper(String trigger) {
this.trigger = trigger;
}
public String toString() {
return "TriggerEdgeWrapper [trigger=" + trigger + "]";
}
-
+
}
-
+
private static class PolicyResultEdgeWrapper implements EdgeWrapper {
private static final long serialVersionUID = 6078569477021558310L;
private PolicyResult policyResult;
public String getId() {
return policyResult.toString();
}
-
-
+
+
}
-
+
private static class FinalResultEdgeWrapper implements EdgeWrapper {
private static final long serialVersionUID = -1486381946896779840L;
private FinalResult finalResult;
-
+
public FinalResultEdgeWrapper(FinalResult result) {
this.finalResult = result;
}
public String toString() {
return "FinalResultEdgeWrapper [finalResult=" + finalResult + "]";
}
-
+
@Override
public String getId() {
return finalResult.toString();
}
}
-
-
+
+
private static class LabeledEdge extends DefaultEdge {
private static final long serialVersionUID = 579384429573385524L;
-
+
private NodeWrapper from;
private NodeWrapper to;
private EdgeWrapper edge;
-
+
public LabeledEdge(NodeWrapper from, NodeWrapper to, EdgeWrapper edge) {
this.from = from;
this.to = to;
this.edge = edge;
}
-
+
@SuppressWarnings("unused")
public NodeWrapper from() {
return from;
}
-
+
@SuppressWarnings("unused")
public NodeWrapper to() {
return to;
}
-
+
@SuppressWarnings("unused")
public EdgeWrapper edge() {
return edge;
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
/**
* Constructor.
- *
+ *
* @param controlLoop copy object
*/
public ControlLoop(ControlLoop controlLoop) {
return false;
}
ControlLoop other = (ControlLoop) obj;
- return equalsMayBeNull(controlLoopName, other.controlLoopName) && equalsMayBeNull(resources, other.resources)
- && equalsMayBeNull(services, other.services) && equalsMayBeNull(timeout, other.timeout)
- && equalsMayBeNull(triggerPolicy, other.triggerPolicy) && equalsMayBeNull(version, other.version)
- && equalsMayBeNull(abatement, other.abatement);
+
+ boolean isEq = equalsMayBeNull(controlLoopName, other.controlLoopName)
+ && equalsMayBeNull(resources, other.resources) && equalsMayBeNull(services, other.services);
+ isEq = isEq && equalsMayBeNull(timeout, other.timeout) && equalsMayBeNull(triggerPolicy, other.triggerPolicy)
+ && equalsMayBeNull(version, other.version);
+ return (isEq && equalsMayBeNull(abatement, other.abatement));
}
private boolean equalsMayBeNull(final Object obj1, final Object obj2) {
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
private String failureTimeout = FinalResult.FINAL_FAILURE_TIMEOUT.toString();
private String failureException = FinalResult.FINAL_FAILURE_EXCEPTION.toString();
private String failureGuard = FinalResult.FINAL_FAILURE_GUARD.toString();
-
-
+
+
public Policy() {
//Does Nothing Empty Constructor
}
-
+
public Policy(String id) {
this.id = id;
}
-
+
/**
* Constructor.
- *
+ *
* @param name name
* @param actor actor
* @param recipe recipe
this.payload = Collections.unmodifiableMap(payload);
}
}
-
+
/**
* Constructor.
- *
+ *
* @param name name
* @param actor actor
* @param recipe recipe
this.retry = retries;
this.timeout = timeout;
}
-
+
/**
* Constructor.
*
this.id = policyParam.getId();
this.description = policyParam.getDescription();
}
-
+
/**
* Constructor.
- *
+ *
* @param policy copy object
*/
public Policy(Policy policy) {
}
public boolean isValid() {
- return id != null && name != null && actor != null && recipe != null && target != null;
+ boolean isValid = id != null && name != null && actor != null;
+ return isValid && recipe != null && target != null;
}
@Override
public String toString() {
return "Policy [id=" + id + ", name=" + name + ", description=" + description + ", actor=" + actor + ", recipe="
- + recipe + ", payload=" + payload + ", target=" + target + ", operationsAccumulateParams="
+ + recipe + ", payload=" + payload + ", target=" + target + ", operationsAccumulateParams="
+ operationsAccumulateParams + ", retry=" + retry + ", timeout=" + timeout
+ ", success=" + success + ", failure=" + failure + ", failure_retries=" + failureRetries
+ ", failure_timeout=" + failureTimeout + ", failure_exception=" + failureException
result = addHashCodeForField(result, timeout);
return result;
}
-
+
private int addHashCodeForField(int hashCode, Object field) {
final int prime = 31;
return prime * hashCode + ((field == null) ? 0 : field.hashCode());
return false;
}
Policy other = (Policy) obj;
- return equalsMayBeNull(actor, other.actor)
+ boolean isEq = equalsMayBeNull(actor, other.actor)
&& equalsMayBeNull(description, other.description)
- && equalsMayBeNull(failure, other.failure)
+ && equalsMayBeNull(failure, other.failure);
+ isEq = isEq
&& equalsMayBeNull(failureException, other.failureException)
- && equalsMayBeNull(failureGuard, other.failureGuard)
+ && equalsMayBeNull(failureGuard, other.failureGuard);
+ isEq = isEq
&& equalsMayBeNull(failureRetries, other.failureRetries)
- && equalsMayBeNull(id, other.id)
+ && equalsMayBeNull(id, other.id);
+ isEq = isEq
&& equalsMayBeNull(name, other.name)
- && equalsMayBeNull(payload, other.payload)
+ && equalsMayBeNull(payload, other.payload);
+ isEq = isEq
&& equalsMayBeNull(recipe, other.recipe)
- && equalsMayBeNull(retry, other.retry)
+ && equalsMayBeNull(retry, other.retry);
+ isEq = isEq
&& equalsMayBeNull(success, other.success)
- && equalsMayBeNull(operationsAccumulateParams, other.operationsAccumulateParams)
+ && equalsMayBeNull(operationsAccumulateParams, other.operationsAccumulateParams);
+ return isEq
&& equalsMayBeNull(target, other.target)
&& equalsMayBeNull(timeout, other.timeout);
}
-
+
private boolean equalsMayBeNull(final Object obj1, final Object obj2) {
if ( obj1 == null ) {
return obj2 == null;
private String modelVersion;
private String modelCustomizationId;
+ public Target() {
+ //Does Nothing Empty Constructor
+ }
+
+ public Target(TargetType type) {
+ this.type = type;
+ }
+
+ public Target(String resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public Target(TargetType type, String resourceId) {
+ this.type = type;
+ this.resourceId = resourceId;
+ }
+
+ public Target(Target target) {
+ this.type = target.type;
+ this.resourceId = target.resourceId;
+ }
+
public String getModelInvariantId() {
return modelInvariantId;
}
this.modelCustomizationId = modelCustomizationId;
} //techm
- public Target() {
- //Does Nothing Empty Constructor
- }
-
- public Target(TargetType type) {
- this.type = type;
- }
-
- public Target(String resourceId) {
- this.resourceId = resourceId;
- }
-
- public Target(TargetType type, String resourceId) {
- this.type = type;
- this.resourceId = resourceId;
- }
-
- public Target(Target target) {
- this.type = target.type;
- this.resourceId = target.resourceId;
- }
-
public String getResourceID() {
return resourceId;
}
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
package org.onap.policy.controlloop.policy.guard;
import java.util.LinkedList;
+import java.util.List;
public class ControlLoopGuard {
-
+
private Guard guard;
-
- private LinkedList<GuardPolicy> guards;
-
+
+ private List<GuardPolicy> guards;
+
public ControlLoopGuard() {
//DO Nothing Empty Constructor
}
-
+
public ControlLoopGuard(ControlLoopGuard clGuard) {
this.guard = new Guard();
this.guards = new LinkedList<>(clGuard.guards);
}
-
+
public Guard getGuard() {
return guard;
}
this.guard = guard;
}
- public LinkedList<GuardPolicy> getGuards() {
+ public List<GuardPolicy> getGuards() {
return guards;
}
- public void setGuards(LinkedList<GuardPolicy> guards) {
+ public void setGuards(List<GuardPolicy> guards) {
this.guards = guards;
}
return true;
}
-
+
}
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
package org.onap.policy.controlloop.policy.guard;
-import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
private String name;
private String description;
private MatchParameters matchParameters;
- private LinkedList<Constraint> limitConstraints;
-
+ private List<Constraint> limitConstraints;
+
public GuardPolicy() {
- //Do Nothing Empty Constructor.
+ //Do Nothing Empty Constructor.
}
-
+
public GuardPolicy(String id) {
this.id = id;
}
-
+
public GuardPolicy(String name, MatchParameters matchParameters) {
this.name = name;
this.matchParameters = matchParameters;
}
-
+
/**
* Constructor.
- *
+ *
* @param id id
* @param name name
* @param description description
this.id = id;
this.description = description;
}
-
+
/**
* Constructor.
- *
+ *
* @param name name
* @param matchParameters match parameters
* @param limitConstraints limit constraints
*/
public GuardPolicy(String name, MatchParameters matchParameters, List<Constraint> limitConstraints) {
this(name, matchParameters);
- if (limitConstraints != null) {
- this.limitConstraints = (LinkedList<Constraint>) limitConstraints;
- }
+ this.limitConstraints = limitConstraints;
}
-
- public GuardPolicy(String name, String description, MatchParameters matchParameters,
+
+ public GuardPolicy(String name, String description, MatchParameters matchParameters,
List<Constraint> limitConstraints) {
this(name, matchParameters, limitConstraints);
this.description = description;
}
-
- public GuardPolicy(String id, String name, String description, MatchParameters matchParameters,
+
+ public GuardPolicy(String id, String name, String description, MatchParameters matchParameters,
List<Constraint> limitConstraints) {
this(name, description, matchParameters, limitConstraints);
this.id = id;
}
-
+
/**
* Constructor.
- *
+ *
* @param policy copy object
*/
public GuardPolicy(GuardPolicy policy) {
this.name = policy.name;
this.description = policy.description;
this.matchParameters = new MatchParameters(policy.matchParameters);
- if (policy.limitConstraints != null) {
- this.limitConstraints = policy.limitConstraints;
- }
+ this.limitConstraints = policy.limitConstraints;
}
-
+
public String getId() {
return id;
}
this.matchParameters = matchParameters;
}
- public LinkedList<Constraint> getLimit_constraints() {
+ public List<Constraint> getLimit_constraints() {
return limitConstraints;
}
- public void setLimit_constraints(LinkedList<Constraint> limitConstraints) {
+ public void setLimit_constraints(List<Constraint> limitConstraints) {
this.limitConstraints = limitConstraints;
}
public boolean isValid() {
- return (id == null || name == null) ? false : true;
+ return (id != null && name != null);
}
-
+
@Override
public String toString() {
- return "Policy [id=" + id + ", name=" + name + ", description=" + description + ", match_parameters="
+ return "Policy [id=" + id + ", name=" + name + ", description=" + description + ", match_parameters="
+ matchParameters + ", limitConstraints=" + limitConstraints + "]";
}
return false;
}
GuardPolicy other = (GuardPolicy) obj;
- return equalsMayBeNull(description, other.description)
+ boolean isEq = equalsMayBeNull(description, other.description)
&& equalsMayBeNull(id, other.id)
- && equalsMayBeNull(name, other.name)
+ && equalsMayBeNull(name, other.name);
+ return isEq
&& equalsMayBeNull(limitConstraints, other.limitConstraints)
&& equalsMayBeNull(matchParameters, other.matchParameters);
}
-
+
private boolean equalsMayBeNull(final Object obj1, final Object obj2) {
if ( obj1 == null ) {
return obj2 == null;
}
return obj1.equals(obj2);
- }
+ }
}
* ============LICENSE_START=======================================================
* policy-yaml
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
public class ControlLoopGuardBuilderImpl implements ControlLoopGuardBuilder {
private static final String NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID = "No existing guard policy matching the id: ";
- private static final String THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL =
+ private static final String THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL =
"The id of target guard policy must not be null";
private static Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderImpl.class.getName());
private ControlLoopGuard clGuard;
-
+
public ControlLoopGuardBuilderImpl(Guard guard) {
clGuard = new ControlLoopGuard();
clGuard.setGuard(guard);
}
-
+
@Override
public ControlLoopGuardBuilder addGuardPolicy(GuardPolicy... policies) throws BuilderException {
if (policies == null) {
}
private boolean addLimitConstraints(String id, Constraint... constraints) throws BuilderException {
- boolean exist = false;
for (GuardPolicy policy: clGuard.getGuards()) {
//
// We could have only one guard policy matching the id
//
if (policy.getId().equals(id)) {
- exist = true;
- for (Constraint cons: constraints) {
- if (!cons.isValid()) {
- throw new BuilderException("Invalid guard constraint - some required fields are missing");
- }
- if (policy.getLimit_constraints() == null) {
- policy.setLimit_constraints(new LinkedList<>());
- }
- policy.getLimit_constraints().add(cons);
- }
- break;
+ addConstraints(policy, constraints);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void addConstraints(GuardPolicy policy, Constraint... constraints) throws BuilderException {
+ for (Constraint cons: constraints) {
+ if (!cons.isValid()) {
+ throw new BuilderException("Invalid guard constraint - some required fields are missing");
+ }
+ if (policy.getLimit_constraints() == null) {
+ policy.setLimit_constraints(new LinkedList<>());
}
+ policy.getLimit_constraints().add(cons);
}
- return exist;
}
@Override
}
private boolean removeConstraints(String id, Constraint... constraints) throws BuilderException {
- boolean exist = false;
for (GuardPolicy policy: clGuard.getGuards()) {
//
// We could have only one guard policy matching the id
//
if (policy.getId().equals(id)) {
- exist = true;
- for (Constraint cons: constraints) {
- if (!cons.isValid()) {
- throw new BuilderException("Invalid guard constraint - some required fields are missing");
- }
- boolean removed = policy.getLimit_constraints().remove(cons);
- if (!removed) {
- throw new BuilderException("Unknown guard constraint: " + cons);
- }
- }
- break;
+ removeConstraints(policy, constraints);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void removeConstraints(GuardPolicy policy, Constraint... constraints) throws BuilderException {
+ for (Constraint cons: constraints) {
+ if (!cons.isValid()) {
+ throw new BuilderException("Invalid guard constraint - some required fields are missing");
+ }
+ boolean removed = policy.getLimit_constraints().remove(cons);
+ if (!removed) {
+ throw new BuilderException("Unknown guard constraint: " + cons);
}
}
- return exist;
}
@Override
public ControlLoopGuardBuilder removeAllLimitConstraints(String id) throws BuilderException {
if (clGuard.getGuards() == null || clGuard.getGuards().isEmpty()) {
throw new BuilderException("No guard policies exist");
- }
+ }
if (id == null) {
throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);
}
return this;
}
-
+
private class BuilderCompilerCallback implements ControlLoopCompilerCallback {
private ResultsImpl results = new ResultsImpl();
-
+
@Override
public boolean onWarning(String message) {
results.addMessage(new MessageImpl(message, MessageLevel.WARNING));
return false;
}
}
-
+
@Override
public ControlLoopGuard getControlLoopGuard() {
return new ControlLoopGuard(this.clGuard);
- }
-
-
+ }
+
+
@Override
public Results buildSpecification() {
//
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
* Modifications 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.
* 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.
public class CompilerExceptionTest extends ExceptionsTester {
@Test
- public void test() throws Exception {
+ public void test() {
test(CompilerException.class);
}
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
public class ControlLoopCompilerTest {
+ private static final String POLICY_RECIPE_IS_INVALID = "Policy recipe is invalid";
+ private static final String RESTART_UNKNOWN_POLICY =
+ "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy";
@Rule
public ExpectedException expectedException = ExpectedException.none();
- @Test
+ @Test
public void testTest() throws Exception {
List<String> expectedOnErrorMessages = new ArrayList<>();
expectedOnErrorMessages.add("Operational Policy has an bad ID");
expectedOnErrorMessages.add("Policy actor is null");
expectedOnErrorMessages.add("Policy actor is invalid");
expectedOnErrorMessages.add("Policy recipe is null");
- expectedOnErrorMessages.add("Policy recipe is invalid");
- expectedOnErrorMessages.add("Policy recipe is invalid");
- expectedOnErrorMessages.add("Policy recipe is invalid");
+ expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID);
+ expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID);
+ expectedOnErrorMessages.add(POLICY_RECIPE_IS_INVALID);
expectedOnErrorMessages.add("Policy target is null");
expectedOnErrorMessages.add("Policy target is invalid");
expectedOnErrorMessages.add("Policy success is neither another policy nor FINAL_SUCCESS");
expectedOnErrorMessages.add("Unsupported version for this compiler");
expectedOnErrorMessages.add("controlLoop overall timeout is less than the sum of operational policy timeouts.");
- TestControlLoopCompilerCallback testControlLoopCompilerCallback =
+ TestControlLoopCompilerCallback testControlLoopCompilerCallback =
new TestControlLoopCompilerCallback(expectedOnErrorMessages);
- ControlLoopPolicy controlLoopPolicy = this.test("src/test/resources/v1.0.0/test.yaml",
+ ControlLoopPolicy controlLoopPolicy = this.test("src/test/resources/v1.0.0/test.yaml",
testControlLoopCompilerCallback);
assertEquals(22, controlLoopPolicy.getPolicies().size());
assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
public void testSuccessConnectedToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_success_connected_to_unknown_policy.yaml");
}
public void testFailureConnectedToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_failure_connected_to_unknown_policy.yaml");
}
public void testFailureTimeoutToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_failure_timeout_connected_to_unknown_policy.yaml");
}
public void testFailureRetriesToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_failure_retries_connected_to_unknown_policy.yaml");
}
public void testFailureExceptionToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_failure_exception_connected_to_unknown_policy.yaml");
}
public void testFailureGuardToUnknownPolicy() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy");
+ RESTART_UNKNOWN_POLICY);
this.test("src/test/resources/v1.0.0/bad_policy_failure_guard_connected_to_unknown_policy.yaml");
}
- @Test
+ @Test
public void testInvalidTriggerPolicyId() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
- "Unexpected value for trigger_policy, should only be "
+ "Unexpected value for trigger_policy, should only be "
+ FinalResult.FINAL_OPENLOOP.toString() + " or a valid Policy ID");
this.test("src/test/resources/v1.0.0/bad_trigger_1.yaml");
}
- @Test
+ @Test
public void testNoTriggerPolicyId() throws Exception {
expectedException.expect(CompilerException.class);
this.test("src/test/resources/v1.0.0/bad_trigger_no_trigger_id.yaml");
}
- @Test
+ @Test
public void testNoControlLoopName() throws Exception {
List<String> expectedOnErrorMessages = new ArrayList<>();
expectedOnErrorMessages.add("Missing controlLoopName");
expectedOnErrorMessages.add("Unsupported version for this compiler");
- TestControlLoopCompilerCallback testControlLoopCompilerCallback =
+ TestControlLoopCompilerCallback testControlLoopCompilerCallback =
new TestControlLoopCompilerCallback(expectedOnErrorMessages);
- this.test("src/test/resources/v1.0.0/bad_control_loop_no_control_loop_name.yaml",
+ this.test("src/test/resources/v1.0.0/bad_control_loop_no_control_loop_name.yaml",
testControlLoopCompilerCallback);
assertTrue(testControlLoopCompilerCallback.areAllExpectedOnErrorsReceived());
}
- @Test
+ @Test
public void testInvalidFinalResult() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage(
this.test("src/test/resources/v1.0.0/bad_trigger_2.yaml");
}
- @Test
+ @Test
public void testCompileEmptyFile() throws Exception {
expectedException.expect(CompilerException.class);
expectedException.expectMessage("Could not parse yaml specification.");
/**
* Does the actual test.
- *
+ *
* @param testFile test file
* @param controlLoopCompilerCallback callback method
* @return the policy object
* @throws Exception exception
*/
- public ControlLoopPolicy test(String testFile,
+ public ControlLoopPolicy test(String testFile,
ControlLoopCompilerCallback controlLoopCompilerCallback) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
return ControlLoopCompiler.compile(is, controlLoopCompilerCallback);
- } catch (FileNotFoundException e) {
- fail(e.getMessage());
- } catch (IOException e) {
- fail(e.getMessage());
- } catch (Exception e) {
- throw e;
}
- return null;
}
class TestControlLoopCompilerCallback implements ControlLoopCompilerCallback {
}
public boolean areAllExpectedOnErrorsReceived() {
- return expectedOnErrorMessages.size() == 0;
+ return expectedOnErrorMessages.isEmpty();
}
}
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
package org.onap.policy.controlloop.compiler;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
-
import org.junit.Test;
-
import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
public class ControlLoopGuardCompilerTest {
- @Test
- public void testTest1() {
- try {
- this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ private static final String ACTOR_ERROR = "Unable to find property 'actor'";
+
+ @Test
+ public void testTest1() throws Exception {
+ this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
}
- @Test
- public void testTest2() {
- try {
- this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
- } catch (Exception e) {
- fail(e.getMessage());
- }
+ @Test
+ public void testTest2() throws Exception {
+ this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
}
- @Test
+ @Test
public void testBad1() {
- try {
- this.test("src/test/resources/v2.0.0-guard/no_guard_policy.yaml");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ assertThatThrownBy(() -> this.test("src/test/resources/v2.0.0-guard/no_guard_policy.yaml"))
+ .hasMessage("Guard policies should not be null");
}
- @Test
+ @Test
public void testBad2() {
- try {
- this.test("src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ assertThatThrownBy(() -> this.test("src/test/resources/v2.0.0-guard/duplicate_guard_policy.yaml"))
+ .hasMessageContaining(ACTOR_ERROR);
}
- @Test
+ @Test
public void testBad3() {
- try {
- this.test("src/test/resources/v2.0.0-guard/no_guard_constraint.yaml");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ assertThatThrownBy(() -> this.test("src/test/resources/v2.0.0-guard/no_guard_constraint.yaml"))
+ .hasMessageContaining(ACTOR_ERROR);
}
- @Test
+ @Test
public void testBad4() {
- try {
- this.test("src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml");
- } catch (Exception e) {
- e.printStackTrace();
- }
+ assertThatThrownBy(() -> this.test("src/test/resources/v2.0.0-guard/duplicate_guard_constraint.yaml"))
+ .hasMessageContaining(ACTOR_ERROR);
}
/**
* Does the actual test.
- *
+ *
* @param testFile input test file
* @throws Exception exception thrown
*/
public void test(String testFile) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
ControlLoopGuardCompiler.compile(is, null);
- } catch (FileNotFoundException e) {
- fail(e.getMessage());
- } catch (IOException e) {
- fail(e.getMessage());
- } catch (Exception e) {
- throw e;
}
}
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
package org.onap.policy.controlloop.policy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
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.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;
-
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
public class ControlLoopPolicyBuilderTest {
+ private static final String RESOURCE1 = "resource1";
+ private static final String TRIGGER_RESTART = "Upon getting the trigger event, restart the VM";
+ private static final String UNKNOWN_POLICY = "Unknown policy ";
+ private static final String RESTART = "Restart";
+ private static final String RESTART_VM = "Restart the VM";
+ private static final String REBUILD = "Rebuild";
+ private static final String REBUILD_VM = "Rebuild VM";
+ private static final String REBUILD_RESTART = "If the restart fails, rebuild it.";
@Rule
public ExpectedException expectedException = ExpectedException.none();
@Test
- public void testControlLoop() {
- try {
- //
- // Create a builder for our policy
- //
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- //
- // Test add services
- //
- Service scp = new Service("vSCP");
- Service usp = new Service("vUSP");
- Service trinity = new Service("Trinity");
- builder = builder.addService(scp, usp, trinity);
- assertTrue(builder.getControlLoop().getServices().size() == 3);
- //
- // Test remove services
- //
- builder = builder.removeService(scp);
- assertTrue(builder.getControlLoop().getServices().size() == 2);
- builder = builder.removeAllServices();
- assertTrue(builder.getControlLoop().getServices().size() == 0);
- //
- // Test add resources
- //
- Resource cts = new Resource("vCTS", ResourceType.VF);
- Resource com = new Resource("vCTS", ResourceType.VF);
- Resource rar = new Resource("vCTS", ResourceType.VF);
- builder = builder.addResource(cts, com, rar);
- assertTrue(builder.getControlLoop().getResources().size() == 3);
- //
- // Test remove resources
- //
- builder = builder.removeResource(cts);
- assertTrue(builder.getControlLoop().getResources().size() == 2);
- builder = builder.removeAllResources();
- assertTrue(builder.getControlLoop().getResources().size() == 0);
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testControlLoop() throws BuilderException {
+ //
+ // Create a builder for our policy
+ //
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
+ //
+ // Test add services
+ //
+ Service scp = new Service("vSCP");
+ Service usp = new Service("vUSP");
+ Service trinity = new Service("Trinity");
+ builder = builder.addService(scp, usp, trinity);
+ assertTrue(builder.getControlLoop().getServices().size() == 3);
+ //
+ // Test remove services
+ //
+ builder = builder.removeService(scp);
+ assertTrue(builder.getControlLoop().getServices().size() == 2);
+ builder = builder.removeAllServices();
+ assertTrue(builder.getControlLoop().getServices().isEmpty());
+ //
+ // Test add resources
+ //
+ Resource cts = new Resource("vCTS", ResourceType.VF);
+ Resource com = new Resource("vCTS", ResourceType.VF);
+ Resource rar = new Resource("vCTS", ResourceType.VF);
+ builder = builder.addResource(cts, com, rar);
+ assertTrue(builder.getControlLoop().getResources().size() == 3);
+ //
+ // Test remove resources
+ //
+ builder = builder.removeResource(cts);
+ assertTrue(builder.getControlLoop().getResources().size() == 2);
+ builder = builder.removeAllResources();
+ assertTrue(builder.getControlLoop().getResources().isEmpty());
}
@Test
assertTrue(builder.getControlLoop().getResources().size() == 1);
builder.removeResource(resourceWithUuid);
- assertTrue(builder.getControlLoop().getResources().size() == 0);
+ assertTrue(builder.getControlLoop().getResources().isEmpty());
}
@Test
public void testRemoveNullResource() throws BuilderException {
ControlLoopPolicyBuilder builder =
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- Resource resource = new Resource("resource1", ResourceType.VF);
+ Resource resource = new Resource(RESOURCE1, ResourceType.VF);
builder.addResource(resource);
expectedException.expect(BuilderException.class);
expectedException.expectMessage("Resource must not be null");
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
expectedException.expect(BuilderException.class);
expectedException.expectMessage("No existing resources to remove");
- builder.removeResource(new Resource("resource1", ResourceType.VF));
+ builder.removeResource(new Resource(RESOURCE1, ResourceType.VF));
}
@Test
public void testRemoveInvalidResource() throws BuilderException {
ControlLoopPolicyBuilder builder =
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- Resource resource = new Resource("resource1", ResourceType.VF);
+ Resource resource = new Resource(RESOURCE1, ResourceType.VF);
builder.addResource(resource);
expectedException.expect(BuilderException.class);
expectedException.expectMessage("Invalid resource - need either a resourceUUID or resourceName");
public void testRemoveUnknownResource() throws BuilderException {
ControlLoopPolicyBuilder builder =
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- Resource resource = new Resource("resource1", ResourceType.VF);
+ Resource resource = new Resource(RESOURCE1, ResourceType.VF);
builder.addResource(resource);
final String unknownResourceName = "reource2";
expectedException.expect(BuilderException.class);
}
@Test
- public void testControlLoopWithInitialResourceAndServices() {
- try {
- Resource cts = new Resource("vCTS", ResourceType.VF);
- Service scp = new Service("vSCP");
- Service usp = new Service("vUSP");
- ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory
- .buildControlLoop(UUID.randomUUID().toString(), 2400, cts, scp, usp);
- assertTrue(builder.getControlLoop().getResources().size() == 1);
- assertTrue(builder.getControlLoop().getServices().size() == 2);
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testControlLoopWithInitialResourceAndServices() throws BuilderException {
+ Resource cts = new Resource("vCTS", ResourceType.VF);
+ Service scp = new Service("vSCP");
+ Service usp = new Service("vUSP");
+ ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory
+ .buildControlLoop(UUID.randomUUID().toString(), 2400, cts, scp, usp);
+ assertTrue(builder.getControlLoop().getResources().size() == 1);
+ assertTrue(builder.getControlLoop().getServices().size() == 2);
}
@Test
- public void testControlLoopWithInitialResourcesAndService() {
- try {
- Resource cts = new Resource("vCTS", ResourceType.VF);
- Resource com = new Resource("vCTS", ResourceType.VF);
- Service scp = new Service("vSCP");
- ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory
- .buildControlLoop(UUID.randomUUID().toString(), 2400, scp, cts, com);
- assertTrue(builder.getControlLoop().getServices().size() == 1);
- assertTrue(builder.getControlLoop().getResources().size() == 2);
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testControlLoopWithInitialResourcesAndService() throws BuilderException {
+ Resource cts = new Resource("vCTS", ResourceType.VF);
+ Resource com = new Resource("vCTS", ResourceType.VF);
+ Service scp = new Service("vSCP");
+ ControlLoopPolicyBuilder builder = ControlLoopPolicyBuilder.Factory
+ .buildControlLoop(UUID.randomUUID().toString(), 2400, scp, cts, com);
+ assertTrue(builder.getControlLoop().getServices().size() == 1);
+ assertTrue(builder.getControlLoop().getResources().size() == 2);
}
@Test
// This constructor does not copy the value of pnf into the newly created object
// On the face of it, this looks like a bug, but perhaps there is a reason for this
// PLEASE ADVISE IF THE BEHAVIOUR IS INCORRECT OR THE TEST CASE IS INVALID
- public void testControlLoopForPnf() {
- try {
- Pnf pnf = new Pnf();
- pnf.setPnfType(PnfType.ENODEB);
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400, pnf);
- assertEquals(pnf, builder.getControlLoop().getPnf());
-
- builder.removePNF();
- assertNull(builder.getControlLoop().getPnf());
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testControlLoopForPnf() throws BuilderException {
+ Pnf pnf = new Pnf();
+ pnf.setPnfType(PnfType.ENODEB);
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400, pnf);
+ assertEquals(pnf, builder.getControlLoop().getPnf());
+
+ builder.removePNF();
+ assertNull(builder.getControlLoop().getPnf());
}
@Test
}
@Test
- public void testTimeout() {
- try {
- //
- // Create a builder for our policy
- //
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- //
- // Test setTimeout
- //
- assertTrue(builder.getControlLoop().getTimeout() == 2400);
- builder = builder.setTimeout(800);
- assertTrue(builder.getControlLoop().getTimeout() == 800);
- //
- // Test calculateTimeout
- //
- Policy trigger =
- builder.setTriggerPolicy(PolicyParam.builder().id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Restart")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- @SuppressWarnings("unused")
- Policy onRestartFailurePolicy = builder.setPolicyForPolicyResult(
- PolicyParam.builder()
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Rebuild")
- .payload(null)
- .retries(1)
- .timeout(600)
- .id(trigger.getId()).build(),
- PolicyResult.FAILURE,
- PolicyResult.FAILURE_RETRIES,
- PolicyResult.FAILURE_TIMEOUT);
- assertTrue(builder.calculateTimeout().equals(new Integer(300 + 600)));
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testTimeout() throws BuilderException {
+ //
+ // Create a builder for our policy
+ //
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
+ //
+ // Test setTimeout
+ //
+ assertTrue(builder.getControlLoop().getTimeout() == 2400);
+ builder = builder.setTimeout(800);
+ assertTrue(builder.getControlLoop().getTimeout() == 800);
+ //
+ // Test calculateTimeout
+ //
+ Policy trigger =
+ builder.setTriggerPolicy(PolicyParam.builder().id(UUID.randomUUID().toString())
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(RESTART)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ @SuppressWarnings("unused")
+ Policy onRestartFailurePolicy = builder.setPolicyForPolicyResult(
+ PolicyParam.builder()
+ .name(REBUILD_VM)
+ .description("If the restart fails, rebuild it")
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(REBUILD)
+ .payload(null)
+ .retries(1)
+ .timeout(600)
+ .id(trigger.getId()).build(),
+ PolicyResult.FAILURE,
+ PolicyResult.FAILURE_RETRIES,
+ PolicyResult.FAILURE_TIMEOUT);
+ assertTrue(builder.calculateTimeout().equals(new Integer(300 + 600)));
}
@Test
- public void testTriggerPolicyMethods() {
- try {
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- //
- // Test isOpenLoop
- //
- assertTrue(builder.isOpenLoop());
- //
- // Test set initial trigger policy
- //
- Policy triggerPolicy1 =
- builder.setTriggerPolicy(
- PolicyParam.builder().id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Restart")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- assertTrue(builder.isOpenLoop() == false);
- assertTrue(builder.getControlLoop().getTrigger_policy().equals(triggerPolicy1.getId()));
- //
- // Set trigger policy to a new policy
- //
- @SuppressWarnings("unused")
- Policy triggerPolicy2 =
- builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Rebuild the VM")
- .description("Upon getting the trigger event, rebuild the VM")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Rebuild")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- //
- // Test set trigger policy to another existing policy
- //
- @SuppressWarnings("unused")
- ControlLoop cl = builder.setExistingTriggerPolicy(triggerPolicy1.getId());
- assertTrue(builder.getControlLoop().getTrigger_policy().equals(triggerPolicy1.getId()));
- //
- // Test get trigger policy
- //
- assertTrue(builder.getTriggerPolicy().equals(triggerPolicy1));
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testTriggerPolicyMethods() throws BuilderException {
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
+ //
+ // Test isOpenLoop
+ //
+ assertTrue(builder.isOpenLoop());
+ //
+ // Test set initial trigger policy
+ //
+ Policy triggerPolicy1 =
+ builder.setTriggerPolicy(
+ PolicyParam.builder().id(UUID.randomUUID().toString())
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(RESTART)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ assertFalse(builder.isOpenLoop());
+ assertEquals(builder.getControlLoop().getTrigger_policy(), triggerPolicy1.getId());
+ //
+ // Set trigger policy to a new policy
+ //
+ @SuppressWarnings("unused")
+ Policy triggerPolicy2 =
+ builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name("Rebuild the VM")
+ .description("Upon getting the trigger event, rebuild the VM")
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(REBUILD)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ //
+ // Test set trigger policy to another existing policy
+ //
+ @SuppressWarnings("unused")
+ ControlLoop cl = builder.setExistingTriggerPolicy(triggerPolicy1.getId());
+ assertTrue(builder.getControlLoop().getTrigger_policy().equals(triggerPolicy1.getId()));
+ //
+ // Test get trigger policy
+ //
+ assertTrue(builder.getTriggerPolicy().equals(triggerPolicy1));
}
@Test
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
final String unknownPolicyId = "100";
expectedException.expect(BuilderException.class);
- expectedException.expectMessage("Unknown policy " + unknownPolicyId);
+ expectedException.expectMessage(UNKNOWN_POLICY + unknownPolicyId);
builder.setExistingTriggerPolicy(unknownPolicyId);
}
builder.setTriggerPolicy(
PolicyParam.builder()
.id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
.actor("APPC")
.target(new Target(TargetType.VM))
- .recipe("Restart")
+ .recipe(RESTART)
.payload(null)
.retries(2)
.timeout(300).build());
final String unknownPolicyId = "100";
expectedException.expect(BuilderException.class);
- expectedException.expectMessage("Unknown policy " + unknownPolicyId);
+ expectedException.expectMessage(UNKNOWN_POLICY + unknownPolicyId);
builder.setExistingTriggerPolicy(unknownPolicyId);
}
@Test
- public void testAddRemovePolicies() {
- try {
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- Policy triggerPolicy =
- builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Restart")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- //
- // Test create a policy and chain it to the results of trigger policy
- //
- Policy onRestartFailurePolicy1 = builder.setPolicyForPolicyResult(
- PolicyParam.builder()
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it.")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Rebuild")
- .payload(null)
- .retries(1)
- .timeout(600)
- .id(triggerPolicy.getId()).build(),
- PolicyResult.FAILURE,
- PolicyResult.FAILURE_EXCEPTION,
- PolicyResult.FAILURE_RETRIES,
- PolicyResult.FAILURE_TIMEOUT,
- PolicyResult.FAILURE_GUARD);
- //
- assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy1.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_exception().equals(onRestartFailurePolicy1.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy1.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy1.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(onRestartFailurePolicy1.getId()));
-
- //
- // Test create a policy and chain it to the results of trigger policy success
- //
- Policy onSuccessPolicy1 = builder.setPolicyForPolicyResult(
- PolicyParam.builder()
- .name("Do something")
- .description("If the restart succeeds, do something else.")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("SomethingElse")
- .payload(null)
- .retries(1)
- .timeout(600)
- .id(triggerPolicy.getId()).build(),
- PolicyResult.SUCCESS);
- //
- assertTrue(builder.getTriggerPolicy().getSuccess().equals(onSuccessPolicy1.getId()));
-
- //
- // Test remove policy
- //
- boolean removed = builder.removePolicy(onRestartFailurePolicy1.getId());
- assertTrue(removed);
- assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
- assertTrue(builder.getTriggerPolicy().getFailure_retries()
- .equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
- assertTrue(builder.getTriggerPolicy().getFailure_timeout()
- .equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
- assertTrue(
- builder.getTriggerPolicy().getFailure_guard().equals(FinalResult.FINAL_FAILURE_GUARD.toString()));
- //
- // Create another policy and chain it to the results of trigger policy
- //
- final Policy onRestartFailurePolicy2 =
- builder.setPolicyForPolicyResult(
- PolicyParam.builder()
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it.")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Rebuild")
- .payload(null)
- .retries(2)
- .timeout(600)
- .id(triggerPolicy.getId()).build(),
- PolicyResult.FAILURE,
- PolicyResult.FAILURE_RETRIES,
- PolicyResult.FAILURE_TIMEOUT);
- //
- // Test reset policy results
- //
- triggerPolicy = builder.resetPolicyResults(triggerPolicy.getId());
- assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
- assertTrue(builder.getTriggerPolicy().getFailure_retries()
- .equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
- assertTrue(builder.getTriggerPolicy().getFailure_timeout()
- .equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
- //
- // Test set the policy results to an existing operational policy
- //
- Policy onRestartFailurePolicy3 =
- builder.setPolicyForPolicyResult(onRestartFailurePolicy2.getId(), triggerPolicy.getId(),
- PolicyResult.FAILURE, PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT);
- assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy3.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy3.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy3.getId()));
- //
- // Test set the policy result for success to an existing operational policy
- //
- Policy onRestartFailurePolicy4 =
- builder.setPolicyForPolicyResult(onRestartFailurePolicy2.getId(), triggerPolicy.getId(),
- PolicyResult.FAILURE, PolicyResult.FAILURE_EXCEPTION, PolicyResult.FAILURE_GUARD,
- PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT, PolicyResult.SUCCESS);
- assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy4.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_exception().equals(onRestartFailurePolicy4.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(onRestartFailurePolicy4.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy4.getId()));
- assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy4.getId()));
- assertTrue(builder.getTriggerPolicy().getSuccess().equals(onRestartFailurePolicy4.getId()));
-
- //
- // Test remove all existing operational policies
- //
- builder = builder.removeAllPolicies();
- assertTrue(builder.getControlLoop().getTrigger_policy().equals(FinalResult.FINAL_OPENLOOP.toString()));
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testAddRemovePolicies() throws BuilderException {
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
+ Policy triggerPolicy =
+ builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(RESTART)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ //
+ // Test create a policy and chain it to the results of trigger policy
+ //
+ Policy onRestartFailurePolicy1 = builder.setPolicyForPolicyResult(
+ PolicyParam.builder()
+ .name(REBUILD_VM)
+ .description(REBUILD_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(REBUILD)
+ .payload(null)
+ .retries(1)
+ .timeout(600)
+ .id(triggerPolicy.getId()).build(),
+ PolicyResult.FAILURE,
+ PolicyResult.FAILURE_EXCEPTION,
+ PolicyResult.FAILURE_RETRIES,
+ PolicyResult.FAILURE_TIMEOUT,
+ PolicyResult.FAILURE_GUARD);
+ //
+ assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy1.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_exception().equals(onRestartFailurePolicy1.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy1.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy1.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(onRestartFailurePolicy1.getId()));
+
+ //
+ // Test create a policy and chain it to the results of trigger policy success
+ //
+ Policy onSuccessPolicy1 = builder.setPolicyForPolicyResult(
+ PolicyParam.builder()
+ .name("Do something")
+ .description("If the restart succeeds, do something else.")
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe("SomethingElse")
+ .payload(null)
+ .retries(1)
+ .timeout(600)
+ .id(triggerPolicy.getId()).build(),
+ PolicyResult.SUCCESS);
+ //
+ assertTrue(builder.getTriggerPolicy().getSuccess().equals(onSuccessPolicy1.getId()));
+
+ //
+ // Test remove policy
+ //
+ boolean removed = builder.removePolicy(onRestartFailurePolicy1.getId());
+ assertTrue(removed);
+ assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
+ assertTrue(builder.getTriggerPolicy().getFailure_retries()
+ .equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
+ assertTrue(builder.getTriggerPolicy().getFailure_timeout()
+ .equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
+ assertTrue(
+ builder.getTriggerPolicy().getFailure_guard().equals(FinalResult.FINAL_FAILURE_GUARD.toString()));
+ //
+ // Create another policy and chain it to the results of trigger policy
+ //
+ final Policy onRestartFailurePolicy2 =
+ builder.setPolicyForPolicyResult(
+ PolicyParam.builder()
+ .name(REBUILD_VM)
+ .description(REBUILD_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(REBUILD)
+ .payload(null)
+ .retries(2)
+ .timeout(600)
+ .id(triggerPolicy.getId()).build(),
+ PolicyResult.FAILURE,
+ PolicyResult.FAILURE_RETRIES,
+ PolicyResult.FAILURE_TIMEOUT);
+ //
+ // Test reset policy results
+ //
+ triggerPolicy = builder.resetPolicyResults(triggerPolicy.getId());
+ assertTrue(builder.getTriggerPolicy().getFailure().equals(FinalResult.FINAL_FAILURE.toString()));
+ assertTrue(builder.getTriggerPolicy().getFailure_retries()
+ .equals(FinalResult.FINAL_FAILURE_RETRIES.toString()));
+ assertTrue(builder.getTriggerPolicy().getFailure_timeout()
+ .equals(FinalResult.FINAL_FAILURE_TIMEOUT.toString()));
+ //
+ // Test set the policy results to an existing operational policy
+ //
+ Policy onRestartFailurePolicy3 =
+ builder.setPolicyForPolicyResult(onRestartFailurePolicy2.getId(), triggerPolicy.getId(),
+ PolicyResult.FAILURE, PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT);
+ assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy3.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy3.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy3.getId()));
+ //
+ // Test set the policy result for success to an existing operational policy
+ //
+ Policy onRestartFailurePolicy4 =
+ builder.setPolicyForPolicyResult(onRestartFailurePolicy2.getId(), triggerPolicy.getId(),
+ PolicyResult.FAILURE, PolicyResult.FAILURE_EXCEPTION, PolicyResult.FAILURE_GUARD,
+ PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT, PolicyResult.SUCCESS);
+ assertTrue(builder.getTriggerPolicy().getFailure().equals(onRestartFailurePolicy4.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_exception().equals(onRestartFailurePolicy4.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_guard().equals(onRestartFailurePolicy4.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_retries().equals(onRestartFailurePolicy4.getId()));
+ assertTrue(builder.getTriggerPolicy().getFailure_timeout().equals(onRestartFailurePolicy4.getId()));
+ assertTrue(builder.getTriggerPolicy().getSuccess().equals(onRestartFailurePolicy4.getId()));
+
+ //
+ // Test remove all existing operational policies
+ //
+ builder = builder.removeAllPolicies();
+ assertTrue(builder.getControlLoop().getTrigger_policy().equals(FinalResult.FINAL_OPENLOOP.toString()));
}
@Test
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
final String policyId = "100";
expectedException.expect(BuilderException.class);
- expectedException.expectMessage("Unknown policy " + policyId);
+ expectedException.expectMessage(UNKNOWN_POLICY + policyId);
builder.setPolicyForPolicyResult(
PolicyParam.builder()
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it.")
+ .name(REBUILD_VM)
+ .description(REBUILD_RESTART)
.actor("APPC")
.target(new Target(TargetType.VM))
- .recipe("Rebuild")
+ .recipe(REBUILD)
.payload(null)
.retries(1)
.timeout(600)
builder.setTriggerPolicy(
PolicyParam.builder()
.id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
.actor("APPC")
.target(new Target(TargetType.VM))
- .recipe("Restart")
+ .recipe(RESTART)
.payload(null)
.retries(2)
.timeout(300).build());
Policy onRestartFailurePolicy = builder.setPolicyForPolicyResult(
PolicyParam.builder()
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it.")
+ .name(REBUILD_VM)
+ .description(REBUILD_RESTART)
.actor("APPC")
.target(new Target(TargetType.VM))
- .recipe("Rebuild")
+ .recipe(REBUILD)
.payload(null)
.retries(1)
.timeout(600)
builder.setTriggerPolicy(
PolicyParam.builder()
.id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
.actor("APPC")
.target(new Target(TargetType.VM))
- .recipe("Restart")
+ .recipe(RESTART)
.payload(null)
.retries(2)
.timeout(300).build());
}
@Test
- public void testAddOperationsAccumulateParams() {
- try {
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
- Policy triggerPolicy =
- builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Restart the eNodeB")
- .description("Upon getting the trigger event, restart the eNodeB")
- .actor("RANController")
- .target(new Target(TargetType.PNF))
- .recipe("Restart")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- //
- // Add the operationsAccumulateParams
- //
- triggerPolicy = builder.addOperationsAccumulateParams(triggerPolicy.getId(),
- new OperationsAccumulateParams("15m", 5));
- assertNotNull(builder.getTriggerPolicy().getOperationsAccumulateParams());
- assertTrue(builder.getTriggerPolicy().getOperationsAccumulateParams().getPeriod().equals("15m"));
- assertTrue(builder.getTriggerPolicy().getOperationsAccumulateParams().getLimit() == 5);
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
- }
+ public void testAddOperationsAccumulateParams() throws BuilderException {
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
+ Policy triggerPolicy =
+ builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name("Restart the eNodeB")
+ .description("Upon getting the trigger event, restart the eNodeB")
+ .actor("RANController")
+ .target(new Target(TargetType.PNF))
+ .recipe(RESTART)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ //
+ // Add the operationsAccumulateParams
+ //
+ triggerPolicy = builder.addOperationsAccumulateParams(triggerPolicy.getId(),
+ new OperationsAccumulateParams("15m", 5));
+ assertNotNull(builder.getTriggerPolicy().getOperationsAccumulateParams());
+ assertEquals("15m", builder.getTriggerPolicy().getOperationsAccumulateParams().getPeriod());
+ assertTrue(builder.getTriggerPolicy().getOperationsAccumulateParams().getLimit() == 5);
}
@Test
- public void testBuildSpecification() {
- try {
- //
- // Create the builder
- //
- ControlLoopPolicyBuilder builder =
- ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 800);
- //
- // Set the first invalid trigger policy
- //
- final Policy policy1 = builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
- .actor(null)
- .target(null)
- .recipe("Instantiate")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- Results results = builder.buildSpecification();
- //
- // Check that ERRORs are in results for invalid policy arguments
- //
- boolean invalidActor = false;
- boolean invalidRecipe = false;
- boolean invalidTarget = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("Policy actor is null") && m.getLevel() == MessageLevel.ERROR) {
- invalidActor = true;
- }
- if (m.getMessage().equals("Policy recipe is invalid") && m.getLevel() == MessageLevel.ERROR) {
- invalidRecipe = true;
- }
- if (m.getMessage().equals("Policy target is null") && m.getLevel() == MessageLevel.ERROR) {
- invalidTarget = true;
- }
+ public void testBuildSpecification() throws BuilderException {
+ //
+ // Create the builder
+ //
+ ControlLoopPolicyBuilder builder =
+ ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 800);
+ //
+ // Set the first invalid trigger policy
+ //
+ final Policy policy1 = builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
+ .actor(null)
+ .target(null)
+ .recipe("Instantiate")
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ Results results = builder.buildSpecification();
+ //
+ // Check that ERRORs are in results for invalid policy arguments
+ //
+ boolean invalidActor = false;
+ boolean invalidRecipe = false;
+ boolean invalidTarget = false;
+ for (Message m : results.getMessages()) {
+ if ("Policy actor is null".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) {
+ invalidActor = true;
}
- //
- assertTrue(invalidActor);
- assertTrue(invalidRecipe);
- assertTrue(invalidTarget);
- //
- // Remove the invalid policy
- //
- // @SuppressWarnings("unused")
- boolean removed = builder.removePolicy(policy1.getId());
- assertTrue(removed);
- assertTrue(builder.getTriggerPolicy() == null);
- //
- // Set a valid trigger policy
- //
- Policy policy1a = builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Rebuild VM")
- .description("If the restart fails, rebuild it.")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Rebuild")
- .payload(null)
- .retries(1)
- .timeout(600).build());
- //
- // Set a second valid trigger policy
- //
- final Policy policy2 =
- builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name("Restart the VM")
- .description("Upon getting the trigger event, restart the VM")
- .actor("APPC")
- .target(new Target(TargetType.VM))
- .recipe("Restart")
- .payload(null)
- .retries(2)
- .timeout(300).build());
- //
- // Now, we have policy1 unreachable
- //
- results = builder.buildSpecification();
- boolean unreachable = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("Policy " + policy1a.getId() + " is not reachable.")
- && m.getLevel() == MessageLevel.WARNING) {
- unreachable = true;
- break;
- }
+ if ("Policy recipe is invalid".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) {
+ invalidRecipe = true;
}
- assertTrue(unreachable);
- //
- // Set policy1a for the failure results of policy2
- //
- policy1a = builder.setPolicyForPolicyResult(policy1a.getId(), policy2.getId(), PolicyResult.FAILURE,
- PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT);
- results = builder.buildSpecification();
- boolean invalidTimeout = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage()
- .equals("controlLoop overall timeout is less than the sum of operational policy timeouts.")
- && m.getLevel() == MessageLevel.ERROR) {
- invalidTimeout = true;
- break;
- }
+ if ("Policy target is null".equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) {
+ invalidTarget = true;
}
- assertTrue(invalidTimeout);
- //
- // Remove policy2 (revert controlLoop back to open loop)
- //
- removed = builder.removePolicy(policy2.getId());
- //
- // ControlLoop is open loop now, but it still has policies (policy1)
- //
- results = builder.buildSpecification();
- unreachable = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("Open Loop policy contains policies. The policies will never be invoked.")
- && m.getLevel() == MessageLevel.WARNING) {
- unreachable = true;
- break;
- }
+ }
+ //
+ assertTrue(invalidActor);
+ assertTrue(invalidRecipe);
+ assertTrue(invalidTarget);
+ //
+ // Remove the invalid policy
+ //
+ // @SuppressWarnings("unused")
+ boolean removed = builder.removePolicy(policy1.getId());
+ assertTrue(removed);
+ assertTrue(builder.getTriggerPolicy() == null);
+ //
+ // Set a valid trigger policy
+ //
+ Policy policy1a = builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name(REBUILD_VM)
+ .description(REBUILD_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(REBUILD)
+ .payload(null)
+ .retries(1)
+ .timeout(600).build());
+ //
+ // Set a second valid trigger policy
+ //
+ final Policy policy2 =
+ builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name(RESTART_VM)
+ .description(TRIGGER_RESTART)
+ .actor("APPC")
+ .target(new Target(TargetType.VM))
+ .recipe(RESTART)
+ .payload(null)
+ .retries(2)
+ .timeout(300).build());
+ //
+ // Now, we have policy1 unreachable
+ //
+ results = builder.buildSpecification();
+ boolean unreachable = false;
+ for (Message m : results.getMessages()) {
+ if (m.getMessage().equals("Policy " + policy1a.getId() + " is not reachable.")
+ && m.getLevel() == MessageLevel.WARNING) {
+ unreachable = true;
+ break;
+ }
+ }
+ assertTrue(unreachable);
+ //
+ // Set policy1a for the failure results of policy2
+ //
+ policy1a = builder.setPolicyForPolicyResult(policy1a.getId(), policy2.getId(), PolicyResult.FAILURE,
+ PolicyResult.FAILURE_RETRIES, PolicyResult.FAILURE_TIMEOUT);
+ results = builder.buildSpecification();
+ boolean invalidTimeout = false;
+ for (Message m : results.getMessages()) {
+ if ("controlLoop overall timeout is less than the sum of operational policy timeouts."
+ .equals(m.getMessage()) && m.getLevel() == MessageLevel.ERROR) {
+ invalidTimeout = true;
+ break;
+ }
+ }
+ assertTrue(invalidTimeout);
+ //
+ // Remove policy2 (revert controlLoop back to open loop)
+ //
+ removed = builder.removePolicy(policy2.getId());
+ //
+ // ControlLoop is open loop now, but it still has policies (policy1)
+ //
+ results = builder.buildSpecification();
+ unreachable = false;
+ for (Message m : results.getMessages()) {
+ if ("Open Loop policy contains policies. The policies will never be invoked.".equals(m.getMessage())
+ && m.getLevel() == MessageLevel.WARNING) {
+ unreachable = true;
+ break;
}
- assertTrue(unreachable);
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
}
+ assertTrue(unreachable);
}
@Test
- public void test1() {
+ public void test1() throws Exception {
this.test("src/test/resources/v1.0.0/policy_Test.yaml");
}
@Test
- public void testEvilYaml() {
+ public void testEvilYaml() throws Exception {
try (InputStream is = new FileInputStream(new File("src/test/resources/v1.0.0/test_evil.yaml"))) {
//
- // Read the yaml into our Java Object
+ // Attempt to read the yaml into our Java Object
//
Yaml yaml = new Yaml(new Constructor(ControlLoopPolicy.class));
- yaml.load(is);
- } catch (FileNotFoundException e) {
- fail(e.getLocalizedMessage());
- } catch (IOException e) {
- fail(e.getLocalizedMessage());
- } catch (YAMLException e) {
- //
- // Should have this
- //
+ assertThatThrownBy(() -> yaml.load(is)).isInstanceOf(YAMLException.class);
}
}
/**
* Does the actual test.
- *
+ *
* @param testFile input file
+ * @throws Exception if an error occurs
*/
- public void test(String testFile) {
+ public void test(String testFile) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
//
// Read the yaml into our Java Object
// Add the policies and be sure to set the trigger policy
//
if (policyTobuild.getPolicies() != null) {
- for (Policy policy : policyTobuild.getPolicies()) {
- if (policy.getId() == policyTobuild.getControlLoop().getTrigger_policy()) {
- builder.setTriggerPolicy(
- PolicyParam.builder()
- .id(UUID.randomUUID().toString())
- .name(policy.getName())
- .description(policy.getDescription())
- .actor(policy.getActor())
- .target(policy.getTarget())
- .recipe(policy.getRecipe())
- .payload(null)
- .retries(policy.getRetry())
- .timeout(policy.getTimeout()).build());
- }
- }
+ setTriggerPolicies(policyTobuild, builder);
}
// Question : how to change policy ID and results by using builder ??
@SuppressWarnings("unused")
Results results = builder.buildSpecification();
-
- } catch (FileNotFoundException e) {
- fail(e.getLocalizedMessage());
- } catch (IOException e) {
- fail(e.getLocalizedMessage());
- } catch (BuilderException e) {
- fail(e.getLocalizedMessage());
}
}
+ private void setTriggerPolicies(ControlLoopPolicy policyTobuild, ControlLoopPolicyBuilder builder)
+ throws BuilderException {
+ for (Policy policy : policyTobuild.getPolicies()) {
+ if (policy.getId() == policyTobuild.getControlLoop().getTrigger_policy()) {
+ builder.setTriggerPolicy(
+ PolicyParam.builder()
+ .id(UUID.randomUUID().toString())
+ .name(policy.getName())
+ .description(policy.getDescription())
+ .actor(policy.getActor())
+ .target(policy.getTarget())
+ .recipe(policy.getRecipe())
+ .payload(null)
+ .retries(policy.getRetry())
+ .timeout(policy.getTimeout()).build());
+ }
+ }
+ }
+
}
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
package org.onap.policy.controlloop.policy;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
-
import org.junit.Test;
import org.onap.policy.common.utils.io.Serializer;
import org.slf4j.Logger;
public class ControlLoopPolicyTest {
private static final Logger logger = LoggerFactory.getLogger(ControlLoopPolicyTest.class);
-
- @Test
- public void test1() {
+
+ @Test
+ public void test1() throws Exception {
this.test("src/test/resources/v1.0.0/policy_Test.yaml");
}
- @Test
- public void testvService1() {
+ @Test
+ public void testvService1() throws Exception {
this.test("src/test/resources/v1.0.0/policy_vService.yaml");
}
- @Test
- public void testOpenLoop() {
+ @Test
+ public void testOpenLoop() throws Exception {
this.test("src/test/resources/v1.0.0/policy_OpenLoop.yaml");
}
- @Test
- public void testvdns() {
+ @Test
+ public void testvdns() throws Exception {
this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vDNS.yaml");
}
- @Test
+ @Test
public void testvFirewall() {
// Chenfei to fix this.
// this.test("src/test/resources/v2.0.0/policy_ONAP_demo_vFirewall.yaml");
}
- @Test
- public void testvcpe() {
+ @Test
+ public void testvcpe() throws Exception {
this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_vCPE.yaml");
}
- @Test
- public void testvpci() {
+ @Test
+ public void testvpci() throws Exception {
this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_vPCI.yaml");
}
- @Test
- public void testvolte() {
+ @Test
+ public void testvolte() throws Exception {
this.test("src/test/resources/v2.0.0/policy_ONAP_UseCase_VOLTE.yaml");
}
/**
* Does the actual test.
- *
+ *
* @param testFile input file
+ * @throws Exception if an error occurs
*/
- public void test(String testFile) {
+ public void test(String testFile) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
//
// Read the yaml into our Java Object
dump(newObject);
assertNotNull(newObject);
assertTrue(newObject instanceof ControlLoopPolicy);
- //
- // Have to comment it out tentatively since it causes junit to fail.
- // Seems we cannot use assertEquals here. Need advice.
- //
- //assertEquals(newObject, obj);
-
+ assertEquals(obj, newObject);
+
// test serialization
ControlLoopPolicy policy = (ControlLoopPolicy) obj;
ControlLoopPolicy policy2 = Serializer.roundTrip(policy);
assertTrue(policy.equals(policy2));
-
- } catch (FileNotFoundException e) {
- fail(e.getLocalizedMessage());
- } catch (IOException e) {
- fail(e.getLocalizedMessage());
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
public class ControlLoopTest {
+ private static final String SERVICE2 = "service2";
+ private static final String SERVICE1 = "service1";
+ private static final String RESOURCE2 = "resource2";
+ private static final String RESOURCE1 = "resource1";
+ private static final String PNF1 = "pnf 1";
private String controlLoopName = "control loop 1";
private String version = "1.0.1";
private String triggerPolicy = FinalResult.FINAL_OPENLOOP.toString();
@Test
public void testEqualsNoServicesAndResourcesOrTimeout() {
final Pnf pnf = new Pnf();
- pnf.setPnfName("pnf 1");
+ pnf.setPnfName(PNF1);
ControlLoop controlLoop1 = new ControlLoop();
controlLoop1.setControlLoopName(controlLoopName);
@Test
public void testEquals() throws IOException {
final Pnf pnf = new Pnf();
- pnf.setPnfName("pnf 1");
+ pnf.setPnfName(PNF1);
ControlLoop controlLoop1 = new ControlLoop();
controlLoop1.setControlLoopName(controlLoopName);
controlLoop1.setVersion(version);
- Service service1 = new Service("service1");
- Service service2 = new Service("service2");
+ Service service1 = new Service(SERVICE1);
+ Service service2 = new Service(SERVICE2);
List<Service> services = new ArrayList<>();
services.add(service1);
services.add(service2);
controlLoop1.setServices(services);
- Resource resource1 = new Resource("resource1", ResourceType.VF);
- Resource resource2 = new Resource("resource2", ResourceType.VFC);
+ Resource resource1 = new Resource(RESOURCE1, ResourceType.VF);
+ Resource resource2 = new Resource(RESOURCE2, ResourceType.VFC);
List<Resource> resources = new ArrayList<>();
resources.add(resource1);
resources.add(resource2);
ControlLoop controlLoop2 = new ControlLoop();
controlLoop2.setControlLoopName(controlLoopName);
controlLoop2.setVersion(version);
- Service controlLoop2Service1 = new Service("service1");
- Service controlLoop2Service2 = new Service("service2");
+ Service controlLoop2Service1 = new Service(SERVICE1);
+ Service controlLoop2Service2 = new Service(SERVICE2);
List<Service> controlLoop2Services = new ArrayList<>();
controlLoop2Services.add(controlLoop2Service1);
controlLoop2Services.add(controlLoop2Service2);
controlLoop2.setServices(controlLoop2Services);
- Resource controlLoop2Resource1 = new Resource("resource1", ResourceType.VF);
- Resource controlLoop2Resource2 = new Resource("resource2", ResourceType.VFC);
+ Resource controlLoop2Resource1 = new Resource(RESOURCE1, ResourceType.VF);
+ Resource controlLoop2Resource2 = new Resource(RESOURCE2, ResourceType.VFC);
List<Resource> controlLoop2Resources = new ArrayList<>();
controlLoop2Resources.add(controlLoop2Resource1);
controlLoop2Resources.add(controlLoop2Resource2);
// PLEASE ADVISE IF THE EXISTING BEHAVIOUR IS CORRECT
public void testControlLoop() {
final Pnf pnf = new Pnf();
- pnf.setPnfName("pnf 1");
+ pnf.setPnfName(PNF1);
ControlLoop controlLoop1 = new ControlLoop();
controlLoop1.setControlLoopName(controlLoopName);
controlLoop1.setVersion(version);
- Service service1 = new Service("service1");
- Service service2 = new Service("service2");
+ Service service1 = new Service(SERVICE1);
+ Service service2 = new Service(SERVICE2);
List<Service> services = new ArrayList<>();
services.add(service1);
services.add(service2);
controlLoop1.setServices(services);
- Resource resource1 = new Resource("resource1", ResourceType.VF);
- Resource resource2 = new Resource("resource2", ResourceType.VFC);
+ Resource resource1 = new Resource(RESOURCE1, ResourceType.VF);
+ Resource resource2 = new Resource(RESOURCE2, ResourceType.VFC);
List<Resource> resources = new ArrayList<>();
resources.add(resource1);
resources.add(resource2);
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
public class ConstraintTest {
+ private static final String TIME_WINDOW_VALUE = "timeWindowValue";
+ private static final String TIME_WINDOW_KEY = "timeWindowKey";
+ private static final String BLACKLIST_ITEM = "blacklist item";
+
@Test
public void testConstraint() {
Constraint constraint = new Constraint();
@Test
public void testGetAndSetTime_window() {
Map<String, String> timeWindow = new HashMap<>();
- timeWindow.put("timeWindowKey", "timeWindowValue");
+ timeWindow.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
Constraint constraint = new Constraint();
constraint.setTime_window(timeWindow);
assertEquals(timeWindow, constraint.getTime_window());
@Test
public void testGetAndSetActive_time_range() {
Map<String, String> activeTimeRange = new HashMap<>();
- activeTimeRange.put("timeWindowKey", "timeWindowValue");
+ activeTimeRange.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
Constraint constraint = new Constraint();
constraint.setActive_time_range(activeTimeRange);;
assertEquals(activeTimeRange, constraint.getActive_time_range());
@Test
public void testGetAndSetBlacklist() {
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint = new Constraint();
constraint.setBlacklist(blacklist);
assertEquals(blacklist, constraint.getBlacklist());
@Test
public void testConstraintListOfString() {
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint = new Constraint(blacklist);
assertNull(constraint.getFreq_limit_per_target());
Integer freqLimitPerTarget = 10;
Map<String, String> timeWindow = new HashMap<>();
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, blacklist);
assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
Integer freqLimitPerTarget = 10;
Map<String, String> timeWindow = new HashMap<>();
Map<String, String> activeTimeRange = new HashMap<>();
- activeTimeRange.put("timeWindowKey", "timeWindowValue");
+ activeTimeRange.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange);
assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
Integer freqLimitPerTarget = 10;
Map<String, String> timeWindow = new HashMap<>();
Map<String, String> activeTimeRange = new HashMap<>();
- activeTimeRange.put("timeWindowKey", "timeWindowValue");
+ activeTimeRange.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
assertEquals(freqLimitPerTarget, constraint.getFreq_limit_per_target());
Integer freqLimitPerTarget = 10;
Map<String, String> timeWindow = new HashMap<>();
Map<String, String> activeTimeRange = new HashMap<>();
- activeTimeRange.put("timeWindowKey", "timeWindowValue");
+ activeTimeRange.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint1 = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
Constraint constraint2 = new Constraint(constraint1);
Integer freqLimitPerTarget = 10;
Map<String, String> timeWindow = new HashMap<>();
Map<String, String> activeTimeRange = new HashMap<>();
- activeTimeRange.put("timeWindowKey", "timeWindowValue");
+ activeTimeRange.put(TIME_WINDOW_KEY, TIME_WINDOW_VALUE);
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint = new Constraint(freqLimitPerTarget, timeWindow, activeTimeRange, blacklist);
assertEquals(constraint.toString(), "Constraint [freq_limit_per_target=" + freqLimitPerTarget + ", time_window="
final Map<String, String> timeWindow = new HashMap<>();
final Map<String, String> activeTimeRange = new HashMap<>();
List<String> blacklist = new ArrayList<>();
- blacklist.add("blacklist item");
+ blacklist.add(BLACKLIST_ITEM);
Constraint constraint1 = new Constraint();
Constraint constraint2 = new Constraint();
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.junit.Test;
import org.onap.policy.controlloop.policy.builder.BuilderException;
import org.onap.policy.controlloop.policy.builder.Message;
public class ControlLoopGuardBuilderTest {
private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderTest.class);
-
+
@Test
- public void testControlLoopGuard() {
- try {
- //
- // Create a builder
- //
- ControlLoopGuardBuilder builder = ControlLoopGuardBuilder.Factory.buildControlLoopGuard(new Guard());
- //
- // Assert there is no guard policies yet
- //
- Results results = builder.buildSpecification();
- boolean noGuardPolicies = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("ControlLoop Guard should have at least one guard policies")
- && m.getLevel() == MessageLevel.ERROR) {
- noGuardPolicies = true;
- break;
- }
+ public void testControlLoopGuard() throws BuilderException {
+ //
+ // Create a builder
+ //
+ ControlLoopGuardBuilder builder = ControlLoopGuardBuilder.Factory.buildControlLoopGuard(new Guard());
+ //
+ // Assert there is no guard policies yet
+ //
+ Results results = builder.buildSpecification();
+ boolean noGuardPolicies = false;
+ for (Message m : results.getMessages()) {
+ if ("ControlLoop Guard should have at least one guard policies".equals(m.getMessage())
+ && m.getLevel() == MessageLevel.ERROR) {
+ noGuardPolicies = true;
+ break;
}
- assertTrue(noGuardPolicies);
- //
- // Add a guard policy without limit constraint
- //
- String clname = "CL_vUSP123";
- LinkedList<String> targets = new LinkedList<String>();
- targets.add("s1");
- targets.add("s2");
- targets.add("s3");
- MatchParameters matchParameters = new MatchParameters(clname, "APPC", "Restart", targets);
- GuardPolicy policy1 = new GuardPolicy("id123", "guardpolicy1", "description aaa", matchParameters);
- builder = builder.addGuardPolicy(policy1);
- //
- // Assert there is no limit constraint associated with the only guard policy
- //
- results = builder.buildSpecification();
- boolean noConstraint = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("Guard policy guardpolicy1 does not have any limit constraint")
- && m.getLevel() == MessageLevel.ERROR) {
- noConstraint = true;
- break;
- }
+ }
+ assertTrue(noGuardPolicies);
+ //
+ // Add a guard policy without limit constraint
+ //
+ String clname = "CL_vUSP123";
+ List<String> targets = new LinkedList<>();
+ targets.add("s1");
+ targets.add("s2");
+ targets.add("s3");
+ MatchParameters matchParameters = new MatchParameters(clname, "APPC", "Restart", targets);
+ GuardPolicy policy1 = new GuardPolicy("id123", "guardpolicy1", "description aaa", matchParameters);
+ builder = builder.addGuardPolicy(policy1);
+ //
+ // Assert there is no limit constraint associated with the only guard policy
+ //
+ results = builder.buildSpecification();
+ boolean noConstraint = false;
+ for (Message m : results.getMessages()) {
+ if ("Guard policy guardpolicy1 does not have any limit constraint".equals(m.getMessage())
+ && m.getLevel() == MessageLevel.ERROR) {
+ noConstraint = true;
+ break;
}
- assertTrue(noConstraint);
- //
- // Add a constraint to policy1
- //
- Map<String, String> activeTimeRange = new HashMap<String, String>();
- activeTimeRange.put("start", "00:00:00-05:00");
- activeTimeRange.put("end", "23:59:59-05:00");
- List<String> blacklist = new LinkedList<String>();
- blacklist.add("eNodeB_common_id1");
- blacklist.add("eNodeB_common_id2");
- Map<String, String> timeWindow = new HashMap<String, String>();
- timeWindow.put("value", "10");
- timeWindow.put("units", "minute");
- Constraint cons = new Constraint(5, timeWindow, activeTimeRange, blacklist);
- builder = builder.addLimitConstraint(policy1.getId(), cons);
- //
- // Add a duplicate constraint to policy1
- //
- builder = builder.addLimitConstraint(policy1.getId(), cons);
- //
- // Assert there are duplicate constraints associated with the only guard policy
- //
- results = builder.buildSpecification();
- boolean duplicateConstraint = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("Guard policy guardpolicy1 has duplicate limit constraints")
- && m.getLevel() == MessageLevel.WARNING) {
- duplicateConstraint = true;
- break;
- }
+ }
+ assertTrue(noConstraint);
+ //
+ // Add a constraint to policy1
+ //
+ Map<String, String> activeTimeRange = new HashMap<>();
+ activeTimeRange.put("start", "00:00:00-05:00");
+ activeTimeRange.put("end", "23:59:59-05:00");
+ List<String> blacklist = new LinkedList<>();
+ blacklist.add("eNodeB_common_id1");
+ blacklist.add("eNodeB_common_id2");
+ Map<String, String> timeWindow = new HashMap<>();
+ timeWindow.put("value", "10");
+ timeWindow.put("units", "minute");
+ Constraint cons = new Constraint(5, timeWindow, activeTimeRange, blacklist);
+ builder = builder.addLimitConstraint(policy1.getId(), cons);
+ //
+ // Add a duplicate constraint to policy1
+ //
+ builder = builder.addLimitConstraint(policy1.getId(), cons);
+ //
+ // Assert there are duplicate constraints associated with the only guard policy
+ //
+ results = builder.buildSpecification();
+ boolean duplicateConstraint = false;
+ for (Message m : results.getMessages()) {
+ if ("Guard policy guardpolicy1 has duplicate limit constraints".equals(m.getMessage())
+ && m.getLevel() == MessageLevel.WARNING) {
+ duplicateConstraint = true;
+ break;
}
- assertTrue(duplicateConstraint);
- //
- // Remove the duplicate constraint
- //
- builder = builder.removeLimitConstraint(policy1.getId(), cons);
- //
- // Add a duplicate guard policy
- //
- builder = builder.addGuardPolicy(policy1);
- builder = builder.addLimitConstraint(policy1.getId(), cons);
- //
- // Assert there are duplicate guard policies
- //
- results = builder.buildSpecification();
- boolean duplicateGuardPolicy = false;
- for (Message m : results.getMessages()) {
- if (m.getMessage().equals("There are duplicate guard policies")
- && m.getLevel() == MessageLevel.WARNING) {
- duplicateGuardPolicy = true;
- break;
- }
+ }
+ assertTrue(duplicateConstraint);
+ //
+ // Remove the duplicate constraint
+ //
+ builder = builder.removeLimitConstraint(policy1.getId(), cons);
+ //
+ // Add a duplicate guard policy
+ //
+ builder = builder.addGuardPolicy(policy1);
+ builder = builder.addLimitConstraint(policy1.getId(), cons);
+ //
+ // Assert there are duplicate guard policies
+ //
+ results = builder.buildSpecification();
+ boolean duplicateGuardPolicy = false;
+ for (Message m : results.getMessages()) {
+ if ("There are duplicate guard policies".equals(m.getMessage())
+ && m.getLevel() == MessageLevel.WARNING) {
+ duplicateGuardPolicy = true;
+ break;
}
- assertTrue(duplicateGuardPolicy);
- //
- // Remove the duplicate guard policy
- //
- builder = builder.removeGuardPolicy(policy1);
- //
- // Assert there are no Error/Warning message
- //
- results = builder.buildSpecification();
- assertTrue(results.getMessages().size() == 1);
- //
- } catch (BuilderException e) {
- fail(e.getMessage());
}
+ assertTrue(duplicateGuardPolicy);
+ //
+ // Remove the duplicate guard policy
+ //
+ builder = builder.removeGuardPolicy(policy1);
+ //
+ // Assert there are no Error/Warning message
+ //
+ results = builder.buildSpecification();
+ assertTrue(results.getMessages().size() == 1);
}
-
+
@Test
- public void test1() {
+ public void test1() throws Exception {
this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
}
-
+
@Test
- public void test2() {
+ public void test2() throws Exception {
this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
}
-
+
/**
* Do the actual test.
- *
+ *
* @param testFile input test file
+ * @throws Exception if an error occurs
*/
- public void test(String testFile) {
+ public void test(String testFile) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
//
// Read the yaml into our Java Object
//
// Now we're going to try to use the builder to build this.
//
- ControlLoopGuardBuilder builder =
+ ControlLoopGuardBuilder builder =
ControlLoopGuardBuilder.Factory.buildControlLoopGuard(guardTobuild.getGuard());
//
// Add guard policy
// Print out the specification
//
logger.debug(results.getSpecification());
- //
- } catch (FileNotFoundException e) {
- fail(e.getLocalizedMessage());
- } catch (IOException e) {
- fail(e.getLocalizedMessage());
- } catch (BuilderException e) {
- fail(e.getLocalizedMessage());
}
}
}
* ============LICENSE_START=======================================================
* policy-yaml unit test
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ControlLoopGuardTest {
private static final Logger logger = LoggerFactory.getLogger(ControlLoopGuardTest.class);
-
- @Test
- public void testGuardvdns() {
+
+ @Test
+ public void testGuardvdns() throws Exception {
this.test("src/test/resources/v2.0.0-guard/policy_guard_ONAP_demo_vDNS.yaml");
}
- @Test
- public void testGuardvusp() {
+ @Test
+ public void testGuardvusp() throws Exception {
this.test("src/test/resources/v2.0.0-guard/policy_guard_appc_restart.yaml");
}
/**
* Does the actual test.
- *
+ *
* @param testFile input file
+ * @throws Exception if an error occurs
*/
- public void test(String testFile) {
+ public void test(String testFile) throws Exception {
try (InputStream is = new FileInputStream(new File(testFile))) {
//
// Read the yaml into our Java Object
dump(newObject);
assertNotNull(newObject);
assertTrue(newObject instanceof ControlLoopGuard);
- //
- // Have to comment it out tentatively since it causes junit to fail.
- // Seems we cannot use assertEquals here. Need advice.
- //
- //assertEquals(newObject, obj);
- } catch (FileNotFoundException e) {
- fail(e.getLocalizedMessage());
- } catch (IOException e) {
- fail(e.getLocalizedMessage());
+
+ assertEquals(obj, newObject);
}
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
public class GuardPolicyTest {
+ private static final String GUARD_DESCRIPTION = "guard description";
+ private static final String GUARD_ID = "guard id";
+ private static final String GUARD_NAME = "guard name";
+
@Test
public void testConstructor() {
GuardPolicy guardPolicy = new GuardPolicy();
@Test
public void testConstructorString() {
- String id = "guard id";
+ String id = GUARD_ID;
GuardPolicy guardPolicy = new GuardPolicy(id);
assertEquals(id, guardPolicy.getId());
@Test
public void testConstructorStringStringStringMatchParameters() {
- String id = "guard id";
- String name = "guard name";
- String description = "guard description";
+ String id = GUARD_ID;
+ String name = GUARD_NAME;
+ String description = GUARD_DESCRIPTION;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testConstructorStringMatchParametersList() {
- String name = "guard name";
+ String name = GUARD_NAME;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testConstructorStringStringMatchParametersList() {
- String name = "guard name";
- String description = "guard description";
+ String name = GUARD_NAME;
+ String description = GUARD_DESCRIPTION;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testConstructorStringStringStringMatchParametersList() {
- String id = "guard id";
- String name = "guard name";
- String description = "guard description";
+ String id = GUARD_ID;
+ String name = GUARD_NAME;
+ String description = GUARD_DESCRIPTION;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testConstructorGuardPolicy() {
- String id = "guard id";
- String name = "guard name";
- String description = "guard description";
+ String id = GUARD_ID;
+ String name = GUARD_NAME;
+ String description = GUARD_DESCRIPTION;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testSetAndGetId() {
- String id = "guard id";
+ String id = GUARD_ID;
GuardPolicy guardPolicy = new GuardPolicy();
guardPolicy.setId(id);
assertEquals(id, guardPolicy.getId());
@Test
public void testSetAndGetName() {
- String name = "guard name";
+ String name = GUARD_NAME;
GuardPolicy guardPolicy = new GuardPolicy();
guardPolicy.setName(name);
assertEquals(name, guardPolicy.getName());
@Test
public void testSetAndGetDescription() {
- String description = "guard description";
+ String description = GUARD_DESCRIPTION;
GuardPolicy guardPolicy = new GuardPolicy();
guardPolicy.setDescription(description);
assertEquals(description, guardPolicy.getDescription());
GuardPolicy guardPolicy = new GuardPolicy();
assertFalse(guardPolicy.isValid());
- guardPolicy.setName("guard name");
+ guardPolicy.setName(GUARD_NAME);
assertTrue(guardPolicy.isValid());
guardPolicy.setId(null);
@Test
public void testToString() {
- String id = "guard id";
- String name = "guard name";
- String description = "guard description";
+ String id = GUARD_ID;
+ String name = GUARD_NAME;
+ String description = GUARD_DESCRIPTION;
MatchParameters matchParameters = new MatchParameters();
List<Constraint> limitConstraints = new LinkedList<>();
limitConstraints.add(new Constraint());
@Test
public void testEquals() {
- final String id = "guard id";
- final String name = "guard name";
- final String description = "guard description";
+ final String id = GUARD_ID;
+ final String name = GUARD_NAME;
+ final String description = GUARD_DESCRIPTION;
GuardPolicy guardPolicy1 = new GuardPolicy(id);
GuardPolicy guardPolicy2 = new GuardPolicy();
assertFalse(guardPolicy1.equals(guardPolicy2));
-# Copyright 2018 AT&T Intellectual Property. All rights reserved
+# Copyright 2018-2019 AT&T Intellectual Property. All rights reserved
# Modifications Copyright (C) 2019 Nordix Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
- resourceName: Bar VNF
resourceType: VF
trigger_policy: unique-policy-id-1-restart
- timeout: 1200
+ timeout: NOT_A_NUMBER
policies:
- id: unique-policy-id-1-restart
throws PfModelException {
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();;
+ JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
jpaPdpGroup.fromAuthorative(pdpGroup);
PfValidationResult validationResult = jpaPdpGroup.validate(new PfValidationResult());
throws PfModelException {
for (PdpGroup pdpGroup : pdpGroups) {
- JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();;
+ JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
jpaPdpGroup.fromAuthorative(pdpGroup);
PfValidationResult validationResult = jpaPdpGroup.validate(new PfValidationResult());
/*-
* ============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.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class PdpGroupFilterTest {
+ private static final String POLICY_TYPE3 = "policy.type.3";
+ private static final String POLICY_TYPE2 = "policy.type.2";
+ private static final String POLICY_TYPE1 = "policy.type.1";
+ private static final String POLICY_TYPE0 = "policy.type.0";
+ private static final String POLICY3 = "Policy3";
+ private static final String POLICY2 = "Policy2";
+ private static final String POLICY1 = "Policy1";
+ private static final String POLICY0 = "Policy0";
+ private static final String NON_EXISTANT = "Nonexistant";
+ private static final String VERSION9 = "9.9.9";
+ private static final String VERSION7 = "7.8.9";
+ private static final String VERSION4 = "4.5.6";
+ private static final String VERSION1 = "1.2.3";
+ private static final String VERSION0 = "0.1.2";
private List<PdpGroup> pdpGroupList;
/**
public void testFilterPolicyType() {
List<ToscaPolicyTypeIdentifier> identifierList = new ArrayList<>();
- identifierList.add(new ToscaPolicyTypeIdentifier("Nonexistant", "1.2.3"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(NON_EXISTANT, VERSION1));
PdpGroupFilter filter =
PdpGroupFilter.builder().policyTypeList(identifierList).build();
List<PdpGroup> filteredList = filter.filter(pdpGroupList);
assertEquals(0, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION1));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(4, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.1", "4.5.6"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE1, VERSION4));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(4, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.2", "7.8.9"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE2, VERSION7));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(2, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.3", "0.1.2"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE3, VERSION0));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(2, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("Nonexistant", "1.2.3"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "9.9.9"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.1", "4.5.6"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.2", "7.8.9"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.3", "0.1.2"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(NON_EXISTANT, VERSION1));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION9));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION1));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE1, VERSION4));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE2, VERSION7));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE3, VERSION0));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(5, filteredList.size());
assertEquals(0, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION1));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).matchPolicyTypesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(2, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.1", "4.5.6"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.2", "7.8.9"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION1));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE1, VERSION4));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE2, VERSION7));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).matchPolicyTypesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.0", "1.2.3"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.1", "4.5.6"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.3", "0.1.2"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE0, VERSION1));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE1, VERSION4));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE3, VERSION0));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).matchPolicyTypesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.1", "4.5.6"));
- identifierList.add(new ToscaPolicyTypeIdentifier("policy.type.3", "0.1.2"));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE1, VERSION4));
+ identifierList.add(new ToscaPolicyTypeIdentifier(POLICY_TYPE3, VERSION0));
filter = PdpGroupFilter.builder().policyTypeList(identifierList).matchPolicyTypesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
public void testFilterPolicy() {
List<ToscaPolicyIdentifier> identifierList = new ArrayList<>();
- identifierList.add(new ToscaPolicyIdentifier("Nonexistant", "1.2.3"));
+ identifierList.add(new ToscaPolicyIdentifier(NON_EXISTANT, VERSION1));
PdpGroupFilter filter =
PdpGroupFilter.builder().policyList(identifierList).build();
List<PdpGroup> filteredList = filter.filter(pdpGroupList);
assertEquals(0, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "9.9.9"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION9));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(0, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(4, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy1", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY1, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy2", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY2, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(2, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy3", "1.2.3"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY3, VERSION1));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Nonexistant", "1.2.3"));
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "9.9.9"));
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6"));
- identifierList.add(new ToscaPolicyIdentifier("Policy1", "4.5.6"));
- identifierList.add(new ToscaPolicyIdentifier("Policy2", "4.5.6"));
- identifierList.add(new ToscaPolicyIdentifier("Policy3", "1.2.3"));
+ identifierList.add(new ToscaPolicyIdentifier(NON_EXISTANT, VERSION1));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION9));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION4));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY1, VERSION4));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY2, VERSION4));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY3, VERSION1));
filter = PdpGroupFilter.builder().policyList(identifierList).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(5, filteredList.size());
assertEquals(0, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).matchPoliciesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(3, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy0", "4.5.6"));
- identifierList.add(new ToscaPolicyIdentifier("Policy1", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY0, VERSION4));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY1, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).matchPoliciesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy2", "4.5.6"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY2, VERSION4));
filter = PdpGroupFilter.builder().policyList(identifierList).matchPoliciesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
identifierList.clear();
- identifierList.add(new ToscaPolicyIdentifier("Policy2", "4.5.6"));
- identifierList.add(new ToscaPolicyIdentifier("Policy3", "1.2.3"));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY2, VERSION4));
+ identifierList.add(new ToscaPolicyIdentifier(POLICY3, VERSION1));
filter = PdpGroupFilter.builder().policyList(identifierList).matchPoliciesExactly(true).build();
filteredList = filter.filter(pdpGroupList);
assertEquals(1, filteredList.size());
* Test methods not tested by {@link ModelsTest}.
*/
public class PdpGroupTest {
+ private static final String VERSION = "1.2.3";
private static final String NAME = "my-name";
private static final String PDP_TYPE1 = "type-1";
private static final String PDP_TYPE2 = "type-2";
// verify with all values
orig.setDescription("my-descript");
orig.setName(NAME);
- orig.setVersion("1.2.3");
+ orig.setVersion(VERSION);
orig.setDescription("my-description");
orig.setPdpGroupState(PdpState.SAFE);
public void testCompareTo() {
PdpGroup pdpGroup0 = new PdpGroup();
pdpGroup0.setName("Name0");
- pdpGroup0.setVersion("1.2.3");
+ pdpGroup0.setVersion(VERSION);
PdpGroup pdpGroup1 = new PdpGroup();
pdpGroup1.setName("Name0");
- pdpGroup1.setVersion("1.2.3");
+ pdpGroup1.setVersion(VERSION);
assertEquals(0, pdpGroup0.compareTo(pdpGroup1));
import org.onap.policy.models.pdp.enums.PdpMessageType;
public class PdpMessageTest {
+ private static final String PDP_GROUP_STRING = " pdp group ";
private static final String PDP_NAME = "pdpA";
private static final String PDP_GROUP = "groupA";
private static final String PDP_SUBGROUP = "subgroupA";
for (String pdpGroup : new String[] {null, PDP_GROUP, DIFFERENT}) {
for (String pdpSubgroup : new String[] {null, PDP_SUBGROUP, DIFFERENT}) {
- assertTrue("name msg " + message + " pdp group " + pdpGroup + "/" + pdpSubgroup,
+ assertTrue("name msg " + message + PDP_GROUP_STRING + pdpGroup + "/" + pdpSubgroup,
message.appliesTo(PDP_NAME, pdpGroup, pdpSubgroup));
}
}
for (String pdpGroup : new String[] {null, PDP_GROUP, DIFFERENT}) {
for (String pdpSubgroup : new String[] {null, PDP_SUBGROUP, DIFFERENT}) {
- assertFalse("name msg " + message + " pdp group " + pdpGroup + "/" + pdpSubgroup,
+ assertFalse("name msg " + message + PDP_GROUP_STRING + pdpGroup + "/" + pdpSubgroup,
message.appliesTo(DIFFERENT, pdpGroup, pdpSubgroup));
}
}
message = makeMessage(null, msgGroup, msgSubgroup);
for (String pdpGroup : new String[] {null, DIFFERENT}) {
- assertFalse("group msg " + message + " pdp group " + pdpGroup,
+ assertFalse("group msg " + message + PDP_GROUP_STRING + pdpGroup,
message.appliesTo(PDP_NAME, pdpGroup, PDP_SUBGROUP));
}
}
*/
public class PdpMessageUtils {
+ private PdpMessageUtils() {
+
+ }
+
public static String removeVariableFields(String text) {
return text.replaceAll("requestId=[^,]*", "requestId=xxx").replaceAll("timestampMs=[^,]*", "timestampMs=nnn");
}
/*-
* ============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.
*/
public class JpaPdpGroupTest {
+ private static final String NULL_KEY_ERROR = "key is marked @NonNull but is null";
+ private static final String PDP_GROUP0 = "PDPGroup0";
+ private static final String VERSION = "1.0.0";
+
@Test
public void testJpaPdpGroup() {
assertThatThrownBy(() -> {
assertThatThrownBy(() -> {
new JpaPdpGroup((PfConceptKey) null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpGroup((PdpGroup) null);
assertThatThrownBy(() -> {
new JpaPdpGroup(null, null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpGroup(new PfConceptKey(), null, null);
assertThatThrownBy(() -> {
new JpaPdpGroup(null, PdpState.PASSIVE, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpGroup(null, PdpState.PASSIVE, new ArrayList<>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpGroup(null, null, new ArrayList<>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertNotNull(new JpaPdpGroup((new PfConceptKey())));
assertNotNull(new JpaPdpGroup((new JpaPdpGroup())));
PdpGroup testPdpGroup = new PdpGroup();
- testPdpGroup.setName("PDPGroup0");
+ testPdpGroup.setName(PDP_GROUP0);
testPdpGroup.setPdpSubgroups(new ArrayList<>());
JpaPdpGroup testJpaPdpGroup = new JpaPdpGroup();
testJpaPdpGroup.setKey(null);
testJpaPdpGroup.setKey(new PfConceptKey());
- testPdpGroup.setVersion("1.0.0");
+ testPdpGroup.setVersion(VERSION);
testJpaPdpGroup.fromAuthorative(testPdpGroup);
- assertEquals("PDPGroup0", testJpaPdpGroup.getKey().getName());
+ assertEquals(PDP_GROUP0, testJpaPdpGroup.getKey().getName());
testJpaPdpGroup.setKey(PfConceptKey.getNullKey());
testJpaPdpGroup.fromAuthorative(testPdpGroup);
testJpaPdpGroup.fromAuthorative(null);
}).hasMessage("pdpGroup is marked @NonNull but is null");
- testJpaPdpGroup.setKey(new PfConceptKey("PDPGroup0", "1.0.0"));
+ testJpaPdpGroup.setKey(new PfConceptKey(PDP_GROUP0, VERSION));
testJpaPdpGroup.fromAuthorative(testPdpGroup);
assertThatThrownBy(() -> {
testJpaPdpGroup.copyTo(null);
}).hasMessage("target is marked @NonNull but is null");
- assertEquals("PDPGroup0", testJpaPdpGroup.getKey().getName());
- assertEquals("PDPGroup0", new JpaPdpGroup(testPdpGroup).getKey().getName());
- assertEquals("PDPGroup0", ((PfConceptKey) new JpaPdpGroup(testPdpGroup).getKeys().get(0)).getName());
+ assertEquals(PDP_GROUP0, testJpaPdpGroup.getKey().getName());
+ assertEquals(PDP_GROUP0, new JpaPdpGroup(testPdpGroup).getKey().getName());
+ assertEquals(PDP_GROUP0, ((PfConceptKey) new JpaPdpGroup(testPdpGroup).getKeys().get(0)).getName());
testJpaPdpGroup.clean();
- assertEquals("PDPGroup0", testJpaPdpGroup.getKey().getName());
+ assertEquals(PDP_GROUP0, testJpaPdpGroup.getKey().getName());
assertThatThrownBy(() -> {
testJpaPdpGroup.validate(null);
testJpaPdpGroup.setKey(PfConceptKey.getNullKey());
assertFalse(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
- testJpaPdpGroup.setKey(new PfConceptKey("PdpGroup0", "1.0.0"));
+ testJpaPdpGroup.setKey(new PfConceptKey("PdpGroup0", VERSION));
assertTrue(testJpaPdpGroup.validate(new PfValidationResult()).isOk());
testJpaPdpGroup.setDescription(" ");
/*-
* ============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.
*/
public class JpaPdpSubGroupTest {
+ private static final String NULL_KEY_ERROR = "key is marked @NonNull but is null";
+ private static final String PDP_A = "PDP-A";
+
@Test
public void testJpaPdpSubGroup() {
assertThatThrownBy(() -> {
assertThatThrownBy(() -> {
new JpaPdpSubGroup((PfReferenceKey) null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup((PdpSubGroup) null);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, null, null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(new PfReferenceKey(), null, null, null);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, new ArrayList<>(), null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, new ArrayList<>(), new ArrayList<>(), null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, null, new ArrayList<>(), null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, null, null, new ArrayList<>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(new PfReferenceKey(), null, null, new ArrayList<>());
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, new ArrayList<>(), null, new ArrayList<>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdpSubGroup(null, null, new ArrayList<>(), null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertNotNull(new JpaPdpSubGroup((new PfReferenceKey())));
PdpSubGroup testPdpSubgroup = new PdpSubGroup();
- testPdpSubgroup.setPdpType("PDP-A");
+ testPdpSubgroup.setPdpType(PDP_A);
JpaPdpSubGroup testJpaPdpSubGroup = new JpaPdpSubGroup();
testJpaPdpSubGroup.setKey(null);
testJpaPdpSubGroup.fromAuthorative(testPdpSubgroup);
- assertEquals("PDP-A", testJpaPdpSubGroup.getKey().getLocalName());
+ assertEquals(PDP_A, testJpaPdpSubGroup.getKey().getLocalName());
testJpaPdpSubGroup.setKey(PfReferenceKey.getNullKey());
testJpaPdpSubGroup.fromAuthorative(testPdpSubgroup);
testJpaPdpSubGroup.copyTo(null);
}).hasMessage("target is marked @NonNull but is null");
- assertEquals("PDP-A", testJpaPdpSubGroup.getKey().getLocalName());
- assertEquals("PDP-A", new JpaPdpSubGroup(testPdpSubgroup).getKey().getLocalName());
- assertEquals("PDP-A", ((PfReferenceKey) new JpaPdpSubGroup(testPdpSubgroup).getKeys().get(0)).getLocalName());
+ assertEquals(PDP_A, testJpaPdpSubGroup.getKey().getLocalName());
+ assertEquals(PDP_A, new JpaPdpSubGroup(testPdpSubgroup).getKey().getLocalName());
+ assertEquals(PDP_A, ((PfReferenceKey) new JpaPdpSubGroup(testPdpSubgroup).getKeys().get(0)).getLocalName());
testJpaPdpSubGroup.clean();
- assertEquals("PDP-A", testJpaPdpSubGroup.getKey().getLocalName());
+ assertEquals(PDP_A, testJpaPdpSubGroup.getKey().getLocalName());
assertThatThrownBy(() -> {
testJpaPdpSubGroup.validate(null);
/*-
* ============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.
import org.onap.policy.models.pdp.concepts.Pdp;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.pdp.persistence.concepts.JpaPdp;
import org.onap.policy.models.pdp.testconcepts.DummyJpaPdpChild;
/**
*/
public class JpaPdpTest {
+ private static final String NULL_KEY_ERROR = "key is marked @NonNull but is null";
+ private static final String PDP1 = "ThePDP";
+
@Test
public void testJpaPdp() {
assertThatThrownBy(() -> {
assertThatThrownBy(() -> {
new JpaPdp((PfReferenceKey) null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdp(null, null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdp(new PfReferenceKey(), null, null);
assertThatThrownBy(() -> {
new JpaPdp(null, PdpState.ACTIVE, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdp(null, PdpState.ACTIVE, PdpHealthStatus.UNKNOWN);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdp(null, null, PdpHealthStatus.UNKNOWN);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
new JpaPdp((Pdp) null);
assertNotNull(new JpaPdp((new PfReferenceKey())));
Pdp testPdp = new Pdp();
- testPdp.setInstanceId("ThePDP");
+ testPdp.setInstanceId(PDP1);
JpaPdp testJpaPdp = new JpaPdp();
testJpaPdp.setKey(null);
testJpaPdp.fromAuthorative(testPdp);
- assertEquals("ThePDP", testJpaPdp.getKey().getLocalName());
+ assertEquals(PDP1, testJpaPdp.getKey().getLocalName());
testJpaPdp.setKey(PfReferenceKey.getNullKey());
testJpaPdp.fromAuthorative(testPdp);
testJpaPdp.copyTo(null);
}).hasMessage("target is marked @NonNull but is null");
- assertEquals("ThePDP", testJpaPdp.getKey().getLocalName());
- assertEquals("ThePDP", new JpaPdp(testPdp).getKey().getLocalName());
- assertEquals("ThePDP", ((PfReferenceKey) new JpaPdp(testPdp).getKeys().get(0)).getLocalName());
+ assertEquals(PDP1, testJpaPdp.getKey().getLocalName());
+ assertEquals(PDP1, new JpaPdp(testPdp).getKey().getLocalName());
+ assertEquals(PDP1, ((PfReferenceKey) new JpaPdp(testPdp).getKeys().get(0)).getLocalName());
testJpaPdp.clean();
- assertEquals("ThePDP", testJpaPdp.getKey().getLocalName());
+ assertEquals(PDP1, testJpaPdp.getKey().getLocalName());
testJpaPdp.setMessage(" A Message ");
testJpaPdp.clean();
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.junit.After;
import org.junit.Before;
import org.onap.policy.models.pdp.concepts.PdpSubGroup;
import org.onap.policy.models.pdp.enums.PdpHealthStatus;
import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.pdp.persistence.provider.PdpProvider;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
import org.onap.policy.models.tosca.simple.provider.SimpleToscaProvider;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
import static org.junit.Assert.assertTrue;
import com.google.gson.GsonBuilder;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.utils.coder.CoderException;
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class ToscaPolicyFilterTest {
+ private static final String VERSION_100 = "1.0.0";
+
+ private static final String VERSION_000 = "0.0.0";
+
// Logger for this class
private static final Logger LOGGER = LoggerFactory.getLogger(ToscaPolicyFilterTest.class);
assertNotNull(serviceTemplate);
for (Map<String, ToscaPolicy> foundPolicyMap : serviceTemplate.getToscaTopologyTemplate().getPolicies()) {
- for (Entry<String, ToscaPolicy> policyEntry : foundPolicyMap.entrySet()) {
- ToscaPolicy policy = policyEntry.getValue();
- if (policy.getName() == null) {
- policy.setName(policyEntry.getKey());
- }
-
- if (policy.getVersion() == null) {
- policy.setVersion(PfKey.NULL_KEY_VERSION);
- }
- if (policy.getTypeVersion() == null) {
- policy.setTypeVersion(PfKey.NULL_KEY_VERSION);
- }
- if (!policyList.contains(policy)) {
- policyList.add(policy);
- }
- }
+ addPolicies(foundPolicyMap);
}
}
}
}
+ private static void addPolicies(Map<String, ToscaPolicy> foundPolicyMap) {
+ for (Entry<String, ToscaPolicy> policyEntry : foundPolicyMap.entrySet()) {
+ ToscaPolicy policy = policyEntry.getValue();
+ if (policy.getName() == null) {
+ policy.setName(policyEntry.getKey());
+ }
+
+ if (policy.getVersion() == null) {
+ policy.setVersion(PfKey.NULL_KEY_VERSION);
+ }
+ if (policy.getTypeVersion() == null) {
+ policy.setTypeVersion(PfKey.NULL_KEY_VERSION);
+ }
+ if (!policyList.contains(policy)) {
+ policyList.add(policy);
+ }
+ }
+ }
+
@Test
public void testNullList() {
ToscaPolicyFilter filter = ToscaPolicyFilter.builder().build();
List<ToscaPolicy> filteredList = filter.filter(policyList);
assertEquals(15, filteredList.size());
- assertEquals("1.0.0", filteredList.get(7).getVersion());
- assertEquals("1.0.0", filteredList.get(12).getVersion());
+ assertEquals(VERSION_100, filteredList.get(7).getVersion());
+ assertEquals(VERSION_100, filteredList.get(12).getVersion());
assertEquals(17, policyList.size());
assertEquals(15, filteredList.size());
assertEquals("2.0.0", filteredList.get(7).getVersion());
assertEquals("3.4.5", filteredList.get(12).getVersion());
- policyList.get(10).setVersion("1.0.0");
- policyList.get(16).setVersion("1.0.0");
+ policyList.get(10).setVersion(VERSION_100);
+ policyList.get(16).setVersion(VERSION_100);
filteredList = filter.filter(policyList);
assertEquals(15, filteredList.size());
- assertEquals("1.0.0", filteredList.get(7).getVersion());
- assertEquals("1.0.0", filteredList.get(12).getVersion());
+ assertEquals(VERSION_100, filteredList.get(7).getVersion());
+ assertEquals(VERSION_100, filteredList.get(12).getVersion());
}
@Test
filteredList = filter.filter(policyList);
assertEquals(0, filteredList.size());
- filter = ToscaPolicyFilter.builder().version("1.0.0").build();
+ filter = ToscaPolicyFilter.builder().version(VERSION_100).build();
filteredList = filter.filter(policyList);
assertEquals(17, filteredList.size());
- filter = ToscaPolicyFilter.builder().name("OSDF_CASABLANCA.SubscriberPolicy_v1").version("1.0.0").build();
+ filter = ToscaPolicyFilter.builder().name("OSDF_CASABLANCA.SubscriberPolicy_v1").version(VERSION_100).build();
filteredList = filter.filter(policyList);
assertEquals(1, filteredList.size());
- filter = ToscaPolicyFilter.builder().name("operational.modifyconfig").version("1.0.0").build();
+ filter = ToscaPolicyFilter.builder().name("operational.modifyconfig").version(VERSION_100).build();
filteredList = filter.filter(policyList);
assertEquals(2, filteredList.size());
}
filteredList = filter.filter(policyList);
assertEquals(0, filteredList.size());
- filter = ToscaPolicyFilter.builder().typeVersion("0.0.0").build();
+ filter = ToscaPolicyFilter.builder().typeVersion(VERSION_000).build();
filteredList = filter.filter(policyList);
assertEquals(17, filteredList.size());
- filter = ToscaPolicyFilter.builder().type("onap.policies.optimization.HpaPolicy").typeVersion("0.0.0").build();
+ filter = ToscaPolicyFilter.builder().type("onap.policies.optimization.HpaPolicy").typeVersion(VERSION_000)
+ .build();
filteredList = filter.filter(policyList);
assertEquals(1, filteredList.size());
- filter = ToscaPolicyFilter.builder().type("onap.policies.controlloop.Operational").typeVersion("0.0.0").build();
+ filter = ToscaPolicyFilter.builder().type("onap.policies.controlloop.Operational").typeVersion(VERSION_000)
+ .build();
filteredList = filter.filter(policyList);
assertEquals(4, filteredList.size());
}
}
@Test
- public void testCopyToscaPolicyIdentifierConstructor() throws Exception {
+ public void testCopyToscaPolicyIdentifierConstructor() {
assertThatThrownBy(() -> new ToscaPolicyIdentifierOptVersion((ToscaPolicyIdentifier) null))
.isInstanceOf(NullPointerException.class);
}
@Test
+ @Override
public void testCompareTo() throws Exception {
super.testCompareTo();
}
}
@Test
+ @Override
public void testCompareTo() throws Exception {
super.testCompareTo();
}
/*-
* ============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.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class ToscaPolicyTypeFilterTest {
+ private static final String VERSION_100 = "1.0.0";
+
+ private static final String VERSION_000 = "0.0.0";
+
// Logger for this class
private static final Logger LOGGER = LoggerFactory.getLogger(ToscaPolicyTypeFilterTest.class);
assertNotNull(serviceTemplate);
for (Map<String, ToscaPolicyType> foundPolicyTypeMap : serviceTemplate.getPolicyTypes()) {
- for (Entry<String, ToscaPolicyType> policyTypeEntry : foundPolicyTypeMap.entrySet()) {
- ToscaPolicyType policyType = policyTypeEntry.getValue();
- if (policyType.getName() == null) {
- policyType.setName(policyTypeEntry.getKey());
- }
- if (policyType.getVersion() == null) {
- policyType.setVersion(PfKey.NULL_KEY_VERSION);
- }
- if (!typeList.contains(policyType)) {
- typeList.add(policyType);
- }
- }
+ addPolicyTypes(foundPolicyTypeMap);
}
}
}
}
+ private static void addPolicyTypes(Map<String, ToscaPolicyType> foundPolicyTypeMap) {
+ for (Entry<String, ToscaPolicyType> policyTypeEntry : foundPolicyTypeMap.entrySet()) {
+ ToscaPolicyType policyType = policyTypeEntry.getValue();
+ if (policyType.getName() == null) {
+ policyType.setName(policyTypeEntry.getKey());
+ }
+ if (policyType.getVersion() == null) {
+ policyType.setVersion(PfKey.NULL_KEY_VERSION);
+ }
+ if (!typeList.contains(policyType)) {
+ typeList.add(policyType);
+ }
+ }
+ }
+
@Test
public void testNullList() {
ToscaPolicyTypeFilter filter = ToscaPolicyTypeFilter.builder().build();
List<ToscaPolicyType> filteredList = filter.filter(typeList);
assertEquals(13, filteredList.size());
- assertEquals("1.0.0", filteredList.get(0).getVersion());
- assertEquals("0.0.0", filteredList.get(4).getVersion());
+ assertEquals(VERSION_100, filteredList.get(0).getVersion());
+ assertEquals(VERSION_000, filteredList.get(4).getVersion());
typeList.get(12).setVersion("2.0.0");
filteredList = filter.filter(typeList);
assertEquals(13, filteredList.size());
assertEquals("2.0.0", filteredList.get(0).getVersion());
- assertEquals("0.0.0", filteredList.get(4).getVersion());
+ assertEquals(VERSION_000, filteredList.get(4).getVersion());
- typeList.get(12).setVersion("1.0.0");
+ typeList.get(12).setVersion(VERSION_100);
filteredList = filter.filter(typeList);
assertEquals(13, filteredList.size());
- assertEquals("1.0.0", filteredList.get(0).getVersion());
- assertEquals("0.0.0", filteredList.get(4).getVersion());
+ assertEquals(VERSION_100, filteredList.get(0).getVersion());
+ assertEquals(VERSION_000, filteredList.get(4).getVersion());
}
@Test
filteredList = filter.filter(typeList);
assertEquals(0, filteredList.size());
- filter = ToscaPolicyTypeFilter.builder().version("0.0.0").build();
+ filter = ToscaPolicyTypeFilter.builder().version(VERSION_000).build();
filteredList = filter.filter(typeList);
assertEquals(9, filteredList.size());
- filter = ToscaPolicyTypeFilter.builder().name("onap.policies.optimization.Vim_fit").version("0.0.0").build();
+ filter = ToscaPolicyTypeFilter.builder().name("onap.policies.optimization.Vim_fit").version(VERSION_000)
+ .build();
filteredList = filter.filter(typeList);
assertEquals(1, filteredList.size());
}
@Test
+ @Override
public void testCompareTo() throws Exception {
super.testCompareTo();
}
/*-
* ============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.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class AuthorativeToscaProviderPolicyTest {
+ private static final String VERSION = "version";
+ private static final String VCPE_JSON = "policies/vCPE.policy.monitoring.input.tosca.json";
+ private static final String POLICY_AND_VERSION = "onap.restart.tca:1.0.0";
+ private static final String POLICY1 = "onap.restart.tca";
+ private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
+ private static final String VERSION_100 = "1.0.0";
private PfDao pfDao;
private StandardCoder standardCoder;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
public void testPoliciesGet() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getPolicies(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getPolicyList(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_JSON),
ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
List<ToscaPolicy> gotPolicyList =
- new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", "1.0.0");
+ new AuthorativeToscaProvider().getPolicyList(pfDao, POLICY1, VERSION_100);
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", null);
+ gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, POLICY1, null);
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, null, "1.0.0");
+ gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, null, VERSION_100);
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
- gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, "Nonexistant", "1.0.0");
+ gotPolicyList = new AuthorativeToscaProvider().getPolicyList(pfDao, "Nonexistant", VERSION_100);
assertEquals(0, gotPolicyList.size());
}
public void testPoliciesGetFiltered() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicies(null, ToscaPolicyFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicies(pfDao, null);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyList(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyList(null, ToscaPolicyFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyList(pfDao, null);
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_JSON),
ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).version("1.0.0").build());
+ ToscaPolicyFilter.builder().name(policyKey.getName()).version(VERSION_100).build());
gotPolicy = gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
assertTrue(beforePolicy.getType().equals(gotPolicy.getType()));
List<ToscaPolicy> gotPolicyList =
- new AuthorativeToscaProvider().getPolicyList(pfDao, "onap.restart.tca", "1.0.0");
+ new AuthorativeToscaProvider().getPolicyList(pfDao, POLICY1, VERSION_100);
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaPolicyFilter.builder().name(policyKey.getName()).version("1.0.0").build());
+ ToscaPolicyFilter.builder().name(policyKey.getName()).version(VERSION_100).build());
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
}
public void testPolicyCreate() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicies(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicies(pfDao, null);
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_JSON),
ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
public void testPolicyUpdate() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicies(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicies(pfDao, null);
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_JSON),
ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
public void testPoliciesDelete() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, null, "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicy(null, null, VERSION);
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicy(null, "name", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, "name", "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicy(null, "name", VERSION);
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicy(pfDao, null, null);
}).hasMessage("name is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, null, "version");
+ new AuthorativeToscaProvider().deletePolicy(pfDao, null, VERSION);
}).hasMessage("name is marked @NonNull but is null");
assertThatThrownBy(() -> {
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_JSON),
ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
- PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
+ PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
}
@Test
- public void testAssertPoliciesExist() throws PfModelException {
+ public void testAssertPoliciesExist() {
ToscaServiceTemplate testServiceTemplate = new ToscaServiceTemplate();
assertThatThrownBy(() -> {
/*-
* ============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.
import static org.junit.Assert.assertTrue;
import com.google.gson.GsonBuilder;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-
import org.apache.commons.lang3.ObjectUtils;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.junit.After;
import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.models.base.PfConceptKey;
-import org.onap.policy.models.base.PfModelException;
import org.onap.policy.models.dao.DaoParameters;
import org.onap.policy.models.dao.PfDao;
import org.onap.policy.models.dao.PfDaoFactory;
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class AuthorativeToscaProviderPolicyTypeTest {
+ private static final String VERSION = "version";
+ private static final String POLICY_AFFINITY_VERSION0 = "onap.policies.optimization.AffinityPolicy:0.0.0";
+ private static final String POLICY_AFFINITY = "onap.policies.optimization.AffinityPolicy";
+ private static final String MISSING_POLICY_TYPES = "no policy types specified on service template";
+ private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
+ private static final String VERSION_000 = "0.0.0";
private static String yamlAsJsonString;
private PfDao pfDao;
private StandardCoder standardCoder;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
public void testPolicyTypesGet() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getPolicyTypes(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getPolicyList(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyTypeKey = new PfConceptKey("onap.policies.optimization.AffinityPolicy:0.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_AFFINITY_VERSION0);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
List<ToscaPolicyType> gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao,
- "onap.policies.optimization.AffinityPolicy", "0.0.0");
+ POLICY_AFFINITY, VERSION_000);
assertEquals(1, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao,
- "onap.policies.optimization.AffinityPolicy", null);
+ POLICY_AFFINITY, null);
assertEquals(1, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
assertEquals(2, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
- gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, "0.0.0");
+ gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, VERSION_000);
assertEquals(2, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
}
public void testPolicyTypesGetFiltered() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypes(null, ToscaPolicyTypeFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao, null);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypeList(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypeList(null, ToscaPolicyTypeFilter.builder().build());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, null);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyTypeKey = new PfConceptKey("onap.policies.optimization.AffinityPolicy:0.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_AFFINITY_VERSION0);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), gotPolicyType.getDescription()));
gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao,
- ToscaPolicyTypeFilter.builder().name(policyTypeKey.getName()).version("0.0.0").build());
+ ToscaPolicyTypeFilter.builder().name(policyTypeKey.getName()).version(VERSION_000).build());
gotPolicyType = gotServiceTemplate.getPolicyTypes().get(0).get(policyTypeKey.getName());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), gotPolicyType.getDescription()));
List<ToscaPolicyType> gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao,
- "onap.policies.optimization.AffinityPolicy", "0.0.0");
+ POLICY_AFFINITY, VERSION_000);
assertEquals(1, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
- ToscaPolicyTypeFilter.builder().name(policyTypeKey.getName()).version("0.0.0").build());
+ ToscaPolicyTypeFilter.builder().name(policyTypeKey.getName()).version(VERSION_000).build());
assertEquals(1, gotPolicyTypeList.size());
assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
public void testPolicyTypesCreate() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(pfDao, null);
ToscaServiceTemplate testToscaServiceTemplate = new ToscaServiceTemplate();
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate);
- }).hasMessage("no policy types specified on service template");
+ }).hasMessage(MISSING_POLICY_TYPES);
testToscaServiceTemplate.setPolicyTypes(new ArrayList<>());
assertThatThrownBy(() -> {
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyTypeKey = new PfConceptKey("onap.policies.optimization.AffinityPolicy:0.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_AFFINITY_VERSION0);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
public void testPolicyTypesUpdate() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicyTypes(null, new ToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().updatePolicyTypes(pfDao, null);
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyTypeKey = new PfConceptKey("onap.policies.optimization.AffinityPolicy:0.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_AFFINITY_VERSION0);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
public void testPolicyTypesDelete() throws Exception {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicyType(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, null, "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, null, VERSION);
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicyType(null, "name", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, "name", "version");
- }).hasMessage("dao is marked @NonNull but is null");
+ new AuthorativeToscaProvider().deletePolicyType(null, "name", VERSION);
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().deletePolicyType(pfDao, null, null);
}).hasMessage("name is marked @NonNull but is null");
assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(pfDao, null, "version");
+ new AuthorativeToscaProvider().deletePolicyType(pfDao, null, VERSION);
}).hasMessage("name is marked @NonNull but is null");
assertThatThrownBy(() -> {
ToscaServiceTemplate createdServiceTemplate =
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplate);
- PfConceptKey policyTypeKey = new PfConceptKey("onap.policies.optimization.AffinityPolicy:0.0.0");
+ PfConceptKey policyTypeKey = new PfConceptKey(POLICY_AFFINITY_VERSION0);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(1).get(policyTypeKey.getName());
}
@Test
- public void testAssertPoliciesExist() throws PfModelException {
+ public void testAssertPoliciesExist() {
ToscaServiceTemplate testServiceTemplate = new ToscaServiceTemplate();
assertThatThrownBy(() -> {
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
- }).hasMessage("no policy types specified on service template");
+ }).hasMessage(MISSING_POLICY_TYPES);
testServiceTemplate.setToscaTopologyTemplate(new ToscaTopologyTemplate());
assertThatThrownBy(() -> {
new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
- }).hasMessage("no policy types specified on service template");
+ }).hasMessage(MISSING_POLICY_TYPES);
testServiceTemplate.setPolicyTypes(new ArrayList<>());
assertThatThrownBy(() -> {
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
/**
* @author Chenfei Gao (cgao@research.att.com)
*/
public class ToscaServiceTemplateMappingTest {
- private static final Logger LOGGER = LoggerFactory.getLogger(ToscaServiceTemplateMappingTest.class);
private StandardCoder standardCoder;
@Test
public void testPlainToscaPolicies() throws Exception {
- try {
- String inputJson = ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json");
+ String inputJson = ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json");
- ToscaServiceTemplate plainPolicies = standardCoder.decode(inputJson, ToscaServiceTemplate.class);
- JpaToscaServiceTemplate internalPolicies = new JpaToscaServiceTemplate();
- internalPolicies.fromAuthorative(plainPolicies);
+ ToscaServiceTemplate plainPolicies = standardCoder.decode(inputJson, ToscaServiceTemplate.class);
+ JpaToscaServiceTemplate internalPolicies = new JpaToscaServiceTemplate();
+ internalPolicies.fromAuthorative(plainPolicies);
- assertTrue(internalPolicies.validate(new PfValidationResult()).isValid());
- ToscaServiceTemplate plainPolicies2 = internalPolicies.toAuthorative();
+ assertTrue(internalPolicies.validate(new PfValidationResult()).isValid());
+ ToscaServiceTemplate plainPolicies2 = internalPolicies.toAuthorative();
- ToscaPolicy pp1 = plainPolicies.getToscaTopologyTemplate().getPolicies().get(0).values().iterator().next();
- ToscaPolicy pp2 = plainPolicies2.getToscaTopologyTemplate().getPolicies().get(0).values().iterator().next();
+ ToscaPolicy pp1 = plainPolicies.getToscaTopologyTemplate().getPolicies().get(0).values().iterator().next();
+ ToscaPolicy pp2 = plainPolicies2.getToscaTopologyTemplate().getPolicies().get(0).values().iterator().next();
- assertEquals(pp1.getProperties().keySet(), pp2.getProperties().keySet());
-
- } catch (Exception e) {
- LOGGER.warn("no exception should be thrown", e);
- fail("no exception should be thrown");
- }
+ assertEquals(pp1.getProperties().keySet(), pp2.getProperties().keySet());
}
@Test
public void testPlainToscaPolicyTypes() throws Exception {
- try {
- Yaml yaml = new Yaml();
- String inputYaml = ResourceUtils.getResourceAsString(
- "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml");
- Object yamlObject = yaml.load(inputYaml);
- String yamlAsJsonString = standardCoder.encode(yamlObject);
-
- ToscaServiceTemplate plainPolicyTypes = standardCoder.decode(yamlAsJsonString,
- ToscaServiceTemplate.class);
- JpaToscaServiceTemplate internalPolicyTypes = new JpaToscaServiceTemplate();
- internalPolicyTypes.fromAuthorative(plainPolicyTypes);
- assertTrue(internalPolicyTypes.validate(new PfValidationResult()).isValid());
- ToscaServiceTemplate plainPolicyTypes2 = internalPolicyTypes.toAuthorative();
- JpaToscaServiceTemplate internalPolicyTypes2 = new JpaToscaServiceTemplate();
- internalPolicyTypes2.fromAuthorative(plainPolicyTypes2);
- assertTrue(internalPolicyTypes2.validate(new PfValidationResult()).isValid());
- assertTrue(internalPolicyTypes.compareTo(internalPolicyTypes2) == 0);
-
- } catch (Exception e) {
- LOGGER.warn("no exception should be thrown", e);
- fail("no exception should be thrown");
- }
-
+ Yaml yaml = new Yaml();
+ String inputYaml = ResourceUtils.getResourceAsString(
+ "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml");
+ Object yamlObject = yaml.load(inputYaml);
+ String yamlAsJsonString = standardCoder.encode(yamlObject);
+
+ ToscaServiceTemplate plainPolicyTypes = standardCoder.decode(yamlAsJsonString,
+ ToscaServiceTemplate.class);
+ JpaToscaServiceTemplate internalPolicyTypes = new JpaToscaServiceTemplate();
+ internalPolicyTypes.fromAuthorative(plainPolicyTypes);
+ assertTrue(internalPolicyTypes.validate(new PfValidationResult()).isValid());
+ ToscaServiceTemplate plainPolicyTypes2 = internalPolicyTypes.toAuthorative();
+ JpaToscaServiceTemplate internalPolicyTypes2 = new JpaToscaServiceTemplate();
+ internalPolicyTypes2.fromAuthorative(plainPolicyTypes2);
+ assertTrue(internalPolicyTypes2.validate(new PfValidationResult()).isValid());
+ assertTrue(internalPolicyTypes.compareTo(internalPolicyTypes2) == 0);
}
}
assertEquals("SO", guard.getContent().getActor());
DummyBadLegacyGuardPolicyContent dblgpc = new DummyBadLegacyGuardPolicyContent();
- assertThatThrownBy(() -> {
- dblgpc.getAsPropertyMap();
- }).hasMessage("could not convert content to a property map");
+ assertThatThrownBy(dblgpc::getAsPropertyMap).hasMessage("could not convert content to a property map");
}
}
/*-
* ============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.
}
@Test
- public void testOperationalPolicyMapper() throws Exception {
+ public void testOperationalPolicyMapper() {
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
serviceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
/*-
* ============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.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class LegacyProvider4LegacyGuardTest {
+ private static final String POLICY_ID_IS_NULL = "policyId is marked @NonNull but is null";
+ private static final String VDNS_OUTPUT_JSON = "policies/vDNS.policy.guard.frequency.output.json";
+ private static final String VDNS_INPUT_JSON = "policies/vDNS.policy.guard.frequency.input.json";
+ private static final String LEGACY_POLICY_IS_NULL = "legacyGuardPolicy is marked @NonNull but is null";
+ private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
private PfDao pfDao;
private StandardCoder standardCoder;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
public void testPoliciesGet() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().getGuardPolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getGuardPolicy(null, null, "");
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getGuardPolicy(pfDao, null, null);
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getGuardPolicy(pfDao, "I Dont Exist", null);
createPolicyTypes();
LegacyGuardPolicyInput originalGip = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.input.json"),
+ ResourceUtils.getResourceAsString(VDNS_INPUT_JSON),
LegacyGuardPolicyInput.class);
assertNotNull(originalGip);
gotGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
String expectedJsonOutput =
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.output.json");
+ ResourceUtils.getResourceAsString(VDNS_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotGopm);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
public void testPolicyCreate() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(null, new LegacyGuardPolicyInput());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(pfDao, null);
- }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
+ }).hasMessage(LEGACY_POLICY_IS_NULL);
createPolicyTypes();
LegacyGuardPolicyInput originalGip = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.input.json"),
+ ResourceUtils.getResourceAsString(VDNS_INPUT_JSON),
LegacyGuardPolicyInput.class);
assertNotNull(originalGip);
gotGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
String expectedJsonOutput =
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.output.json");
+ ResourceUtils.getResourceAsString(VDNS_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotGopm);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
public void testPolicyCreateBad() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(null, new LegacyGuardPolicyInput());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createGuardPolicy(pfDao, null);
- }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
+ }).hasMessage(LEGACY_POLICY_IS_NULL);
createPolicyTypes();
LegacyGuardPolicyInput originalGip = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.input.json"),
+ ResourceUtils.getResourceAsString(VDNS_INPUT_JSON),
LegacyGuardPolicyInput.class);
assertNotNull(originalGip);
public void testPolicyUpdate() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().updateGuardPolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().updateGuardPolicy(null, new LegacyGuardPolicyInput());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().updateGuardPolicy(pfDao, null);
- }).hasMessage("legacyGuardPolicy is marked @NonNull but is null");
+ }).hasMessage(LEGACY_POLICY_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().updateGuardPolicy(pfDao, new LegacyGuardPolicyInput());
createPolicyTypes();
LegacyGuardPolicyInput originalGip = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.input.json"),
+ ResourceUtils.getResourceAsString(VDNS_INPUT_JSON),
LegacyGuardPolicyInput.class);
assertNotNull(originalGip);
public void testPoliciesDelete() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(null, null, "");
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(null, "", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(null, "", "");
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(pfDao, null, null);
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(pfDao, null, "");
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteGuardPolicy(pfDao, "", null);
createPolicyTypes();
LegacyGuardPolicyInput originalGip = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.input.json"),
+ ResourceUtils.getResourceAsString(VDNS_INPUT_JSON),
LegacyGuardPolicyInput.class);
assertNotNull(originalGip);
gotGopm.get(originalGip.getPolicyId()).getProperties().values().iterator().next());
String expectedJsonOutput =
- ResourceUtils.getResourceAsString("policies/vDNS.policy.guard.frequency.output.json");
+ ResourceUtils.getResourceAsString(VDNS_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotGopm);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
/*-
* ============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.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class LegacyProvider4LegacyOperationalTest {
+ private static final String POLICY_ID_IS_NULL = "policyId is marked @NonNull but is null";
+ private static final String VCPE_OUTPUT_JSON = "policies/vCPE.policy.operational.output.json";
+ private static final String VCPE_INPUT_JSON = "policies/vCPE.policy.operational.input.json";
+ private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
private PfDao pfDao;
private StandardCoder standardCoder;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
public void testPoliciesGet() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().getOperationalPolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getOperationalPolicy(null, "", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getOperationalPolicy(pfDao, null, null);
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().getOperationalPolicy(pfDao, "I Dont Exist", null);
createPolicyTypes();
LegacyOperationalPolicy originalLop =
- standardCoder.decode(ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.input.json"),
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
LegacyOperationalPolicy.class);
assertNotNull(originalLop);
assertEquals(gotLop, originalLop);
- String expectedJsonOutput = ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.output.json");
+ String expectedJsonOutput = ResourceUtils.getResourceAsString(VCPE_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotLop);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
public void testPolicyCreate() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().createOperationalPolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createOperationalPolicy(null, new LegacyOperationalPolicy());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().createOperationalPolicy(pfDao, null);
createPolicyTypes();
LegacyOperationalPolicy originalLop =
- standardCoder.decode(ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.input.json"),
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
LegacyOperationalPolicy.class);
assertNotNull(originalLop);
assertEquals(gotLop, originalLop);
- String expectedJsonOutput = ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.output.json");
+ String expectedJsonOutput = ResourceUtils.getResourceAsString(VCPE_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotLop);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
public void testPolicyUpdate() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().updateOperationalPolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().updateOperationalPolicy(null, new LegacyOperationalPolicy());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().updateOperationalPolicy(pfDao, null);
createPolicyTypes();
LegacyOperationalPolicy originalLop =
- standardCoder.decode(ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.input.json"),
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
LegacyOperationalPolicy.class);
assertNotNull(originalLop);
public void testPoliciesDelete() throws Exception {
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(null, null, "");
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(null, "", null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(null, "", "");
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(pfDao, null, null);
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(pfDao, null, "");
- }).hasMessage("policyId is marked @NonNull but is null");
+ }).hasMessage(POLICY_ID_IS_NULL);
assertThatThrownBy(() -> {
new LegacyProvider().deleteOperationalPolicy(pfDao, "", null);
createPolicyTypes();
LegacyOperationalPolicy originalLop =
- standardCoder.decode(ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.input.json"),
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
LegacyOperationalPolicy.class);
assertNotNull(originalLop);
assertEquals(gotLop, originalLop);
- String expectedJsonOutput = ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.output.json");
+ String expectedJsonOutput = ResourceUtils.getResourceAsString(VCPE_OUTPUT_JSON);
String actualJsonOutput = standardCoder.encode(gotLop);
assertEquals(expectedJsonOutput.replaceAll("\\s+", ""), actualJsonOutput.replaceAll("\\s+", ""));
/*-
* ============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.
*/
public class JpaToscaConstraintLogicalTest {
+ private static final String HELLO = "Hello";
+
@Test
public void testLogicalConstraint() {
ToscaConstraint c0 = new ToscaConstraint();
- c0.setEqual("Hello");
+ c0.setEqual(HELLO);
JpaToscaConstraintLogical jc0 = new JpaToscaConstraintLogical(c0);
assertEquals(c0, jc0.toAuthorative());
ToscaConstraint c1 = new ToscaConstraint();
- c1.setGreaterOrEqual("Hello");
+ c1.setGreaterOrEqual(HELLO);
JpaToscaConstraintLogical jc1 = new JpaToscaConstraintLogical(c1);
assertEquals(c1, jc1.toAuthorative());
ToscaConstraint c2 = new ToscaConstraint();
- c2.setGreaterThan("Hello");
+ c2.setGreaterThan(HELLO);
JpaToscaConstraintLogical jc2 = new JpaToscaConstraintLogical(c2);
assertEquals(c2, jc2.toAuthorative());
ToscaConstraint c3 = new ToscaConstraint();
- c3.setLessOrEqual("Hello");
+ c3.setLessOrEqual(HELLO);
JpaToscaConstraintLogical jc3 = new JpaToscaConstraintLogical(c3);
assertEquals(c3, jc3.toAuthorative());
ToscaConstraint c4 = new ToscaConstraint();
- c4.setLessThan("Hello");
+ c4.setLessThan(HELLO);
JpaToscaConstraintLogical jc4 = new JpaToscaConstraintLogical(c4);
assertEquals(c4, jc4.toAuthorative());
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Test;
import org.onap.policy.models.tosca.authorative.concepts.ToscaConstraint;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraintLogical;
/**
* DAO test for ToscaConstraintLogicalString.
*/
public class JpaToscaConstraintTest {
+ private static final String CONSTRAINT = "Constraint";
+
@Test
public void testConstraintLogicalStringPojo() {
- assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "Constraint"));
+ assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT));
- try {
- new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("operation is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, null))
+ .hasMessage("operation is marked @NonNull but is null");
- try {
- new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, "Hello");
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("operation is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaConstraintLogical((JpaToscaConstraintOperation) null, "Hello"))
+ .hasMessage("operation is marked @NonNull but is null");
- try {
- new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("compareTo is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, null))
+ .hasMessage("compareTo is marked @NonNull but is null");
- assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "Constraint"));
+ assertNotNull(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT));
assertEquals(0, new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "")
.compareTo(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "")));
JpaToscaConstraintValidValues cvv0 = new JpaToscaConstraintValidValues(validValues);
assertEquals(-1, cvv0.compareTo(null));
assertEquals(0, cvv0.compareTo(cvv0));
- assertNotEquals(0, cvv0.compareTo(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "Constraint")));
+ assertNotEquals(0, cvv0.compareTo(new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, CONSTRAINT)));
JpaToscaConstraintValidValues cvv1 = new JpaToscaConstraintValidValues(validValues);
assertEquals(0, cvv0.compareTo(cvv1));
/*-
* ============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.
*/
public class JpaToscaDataTypeTest {
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testDataTypePojo() {
assertNotNull(new JpaToscaDataType());
new JpaToscaDataType((JpaToscaDataType) null);
}).hasMessage("copyConcept is marked @NonNull but is null");
- PfConceptKey dtKey = new PfConceptKey("tdt", "0.0.1");
+ PfConceptKey dtKey = new PfConceptKey("tdt", VERSION_001);
JpaToscaDataType tdt = new JpaToscaDataType(dtKey);
List<JpaToscaConstraint> constraints = new ArrayList<>();
assertEquals(constraints, tdt.getConstraints());
Map<String, JpaToscaProperty> properties = new LinkedHashMap<>();
- JpaToscaProperty tp = new JpaToscaProperty(new PfReferenceKey(dtKey, "pr"), new PfConceptKey("type", "0.0.1"));
+ JpaToscaProperty tp =
+ new JpaToscaProperty(new PfReferenceKey(dtKey, "pr"), new PfConceptKey("type", VERSION_001));
properties.put(tp.getKey().getLocalName(), tp);
tdt.setProperties(properties);
assertEquals(properties, tdt.getProperties());
assertEquals(0, tdt.compareTo(tdt));
assertFalse(tdt.compareTo(tdt.getKey()) == 0);
- PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
+ PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaDataType otherDt = new JpaToscaDataType(otherDtKey);
assertFalse(tdt.compareTo(otherDt) == 0);
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.tosca.authorative.concepts.ToscaDataType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
public class JpaToscaDataTypesTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+
@Test
public void testDataTypes() {
assertNotNull(new JpaToscaDataTypes());
assertNotNull(new JpaToscaDataTypes(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaDataType>()));
assertNotNull(new JpaToscaDataTypes(new JpaToscaDataTypes()));
- try {
- new JpaToscaDataTypes((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaDataTypes((PfConceptKey) null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaDataTypes((JpaToscaDataTypes) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaDataTypes((JpaToscaDataTypes) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
- try {
- new JpaToscaDataTypes(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaDataTypes(null, null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaDataTypes(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaDataTypes(new PfConceptKey(), null))
+ .hasMessage("conceptMap is marked @NonNull but is null");
- try {
- new JpaToscaDataTypes(null, new TreeMap<PfConceptKey, JpaToscaDataType>());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaDataTypes(null, new TreeMap<PfConceptKey, JpaToscaDataType>()))
+ .hasMessage(KEY_IS_NULL);
List<Map<String, ToscaDataType>> dtMapList = new ArrayList<>();
dtMapList.add(new LinkedHashMap<>());
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraint;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaEntrySchema;
/**
* DAO test for ToscaEntrySchema.
*/
public class JpaToscaEntrySchemaTest {
+ private static final String A_DESCRIPTION = "A Description";
+
@Test
public void testEntrySchemaPojo() {
assertNotNull(new JpaToscaEntrySchema(new PfConceptKey()));
assertNotNull(new JpaToscaEntrySchema(new JpaToscaEntrySchema(new PfConceptKey())));
- try {
- new JpaToscaEntrySchema((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("type is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaEntrySchema((PfConceptKey) null))
+ .hasMessage("type is marked @NonNull but is null");
- try {
- new JpaToscaEntrySchema((JpaToscaEntrySchema) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaEntrySchema((JpaToscaEntrySchema) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
PfConceptKey typeKey = new PfConceptKey("type", "0.0.1");
JpaToscaEntrySchema tes = new JpaToscaEntrySchema(typeKey);
- tes.setDescription("A Description");
- assertEquals("A Description", tes.getDescription());
+ tes.setDescription(A_DESCRIPTION);
+ assertEquals(A_DESCRIPTION, tes.getDescription());
List<JpaToscaConstraint> constraints = new ArrayList<>();
JpaToscaConstraintLogical lsc = new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "hello");
assertFalse(tes.compareTo(otherEs) == 0);
otherEs.setType(typeKey);
assertFalse(tes.compareTo(otherEs) == 0);
- otherEs.setDescription("A Description");
+ otherEs.setDescription(A_DESCRIPTION);
assertFalse(tes.compareTo(otherEs) == 0);
otherEs.setConstraints(constraints);
assertEquals(0, tes.compareTo(otherEs));
- try {
- tes.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tes.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(1, tes.getKeys().size());
assertEquals(1, new JpaToscaEntrySchema(typeKey).getKeys().size());
tes.setDescription("");;
assertFalse(tes.validate(new PfValidationResult()).isValid());
- tes.setDescription("A Description");
+ tes.setDescription(A_DESCRIPTION);
assertTrue(tes.validate(new PfValidationResult()).isValid());
tes.getConstraints().add(null);
tes.getConstraints().remove(null);
assertTrue(tes.validate(new PfValidationResult()).isValid());
- try {
- tes.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tes.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaEventFilter;
/**
* DAO test for ToscaEventFilter.
*/
public class JpaToscaEventFilterTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String A_REQUREMENT = "A Requrement";
+ private static final String A_CAPABILITY = "A Capability";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testEventFilterPojo() {
assertNotNull(new JpaToscaEventFilter());
assertNotNull(new JpaToscaEventFilter(new PfReferenceKey(), new PfConceptKey()));
assertNotNull(new JpaToscaEventFilter(new JpaToscaEventFilter()));
- try {
- new JpaToscaEventFilter((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEventFilter(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEventFilter(null, new PfConceptKey());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEventFilter(new PfReferenceKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("node is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEventFilter((JpaToscaEventFilter) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey efParentKey = new PfConceptKey("tParentKey", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaEventFilter((PfReferenceKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaEventFilter(null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaEventFilter(null, new PfConceptKey())).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaEventFilter(new PfReferenceKey(), null))
+ .hasMessage("node is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaEventFilter((JpaToscaEventFilter) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey efParentKey = new PfConceptKey("tParentKey", VERSION_001);
PfReferenceKey efKey = new PfReferenceKey(efParentKey, "trigger0");
- PfConceptKey nodeKey = new PfConceptKey("tParentKey", "0.0.1");
+ PfConceptKey nodeKey = new PfConceptKey("tParentKey", VERSION_001);
JpaToscaEventFilter tef = new JpaToscaEventFilter(efKey, nodeKey);
- tef.setRequirement("A Requrement");
- assertEquals("A Requrement", tef.getRequirement());
+ tef.setRequirement(A_REQUREMENT);
+ assertEquals(A_REQUREMENT, tef.getRequirement());
- tef.setCapability("A Capability");
- assertEquals("A Capability", tef.getCapability());
+ tef.setCapability(A_CAPABILITY);
+ assertEquals(A_CAPABILITY, tef.getCapability());
JpaToscaEventFilter tdtClone0 = new JpaToscaEventFilter(tef);
assertEquals(tef, tdtClone0);
assertEquals(0, tef.compareTo(tef));
assertFalse(tef.compareTo(tef.getKey()) == 0);
- PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherEventFilter");
+ PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", VERSION_001, "OtherEventFilter");
JpaToscaEventFilter otherDt = new JpaToscaEventFilter(otherDtKey);
assertFalse(tef.compareTo(otherDt) == 0);
assertFalse(tef.compareTo(otherDt) == 0);
otherDt.setNode(nodeKey);
assertFalse(tef.compareTo(otherDt) == 0);
- otherDt.setRequirement("A Requrement");
+ otherDt.setRequirement(A_REQUREMENT);
assertFalse(tef.compareTo(otherDt) == 0);
- otherDt.setCapability("A Capability");
+ otherDt.setCapability(A_CAPABILITY);
assertEquals(0, tef.compareTo(otherDt));
- try {
- tef.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tef.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(2, tef.getKeys().size());
assertEquals(2, new JpaToscaEventFilter().getKeys().size());
assertTrue(tef.validate(new PfValidationResult()).isValid());
tef.setRequirement("");
assertFalse(tef.validate(new PfValidationResult()).isValid());
- tef.setRequirement("A Requrement");
+ tef.setRequirement(A_REQUREMENT);
assertTrue(tef.validate(new PfValidationResult()).isValid());
tef.setCapability(null);
assertTrue(tef.validate(new PfValidationResult()).isValid());
tef.setCapability("");
assertFalse(tef.validate(new PfValidationResult()).isValid());
- tef.setCapability("A Capability");
+ tef.setCapability(A_CAPABILITY);
assertTrue(tef.validate(new PfValidationResult()).isValid());
tef.setNode(null);
tef.setNode(nodeKey);
assertTrue(tef.validate(new PfValidationResult()).isValid());
- try {
- tef.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tef.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelService;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaModel;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplates;
/**
* DAO test for ToscaDatatype.
*/
public class JpaToscaModelTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testModelPojo() {
assertNotNull(new JpaToscaModel());
assertNotNull(new JpaToscaModel(new PfConceptKey(), new JpaToscaServiceTemplates()));
assertNotNull(new JpaToscaModel(new JpaToscaModel()));
- try {
- new JpaToscaModel((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaModel(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaModel(null, new JpaToscaServiceTemplates());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaModel(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("serviceTemplates is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaModel((JpaToscaModel) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey tstsKey = new PfConceptKey("tsts", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaModel((PfConceptKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaModel(null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaModel(null, new JpaToscaServiceTemplates())).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaModel(new PfConceptKey(), null))
+ .hasMessage("serviceTemplates is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaModel((JpaToscaModel) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey tstsKey = new PfConceptKey("tsts", VERSION_001);
Map<PfConceptKey, JpaToscaServiceTemplate> tstMap = new TreeMap<>();
JpaToscaServiceTemplates tsts = new JpaToscaServiceTemplates(tstsKey, tstMap);
- PfConceptKey tmKey = new PfConceptKey("tst", "0.0.1");
+ PfConceptKey tmKey = new PfConceptKey("tst", VERSION_001);
JpaToscaModel tm = new JpaToscaModel(tmKey, tsts);
JpaToscaModel tttClone0 = new JpaToscaModel(tm);
assertEquals(0, tm.compareTo(tm));
assertFalse(tm.compareTo(tm.getKey()) == 0);
- PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
+ PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaModel otherDt = new JpaToscaModel(otherDtKey);
assertFalse(tm.compareTo(otherDt) == 0);
otherDt.setServiceTemplates(tsts);
assertEquals(0, tm.compareTo(otherDt));
- try {
- tm.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("targetObject is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tm.copyTo(null)).hasMessage("targetObject is marked @NonNull but is null");
assertEquals(2, tm.getKeys().size());
assertEquals(2, new JpaToscaModel().getKeys().size());
assertTrue(PfModelService.existsModel(tm.getServiceTemplates().getId()));
PfModelService.deregisterModel(tm.getServiceTemplates().getId());
- try {
- tm.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tm.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicies;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicy;
public class JpaToscaPoliciesTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+
@Test
public void testPolicies() {
assertNotNull(new JpaToscaPolicies());
assertNotNull(new JpaToscaPolicies(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaPolicy>()));
assertNotNull(new JpaToscaPolicies(new JpaToscaPolicies()));
- try {
- new JpaToscaPolicies((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicies((PfConceptKey) null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaPolicies((JpaToscaPolicies) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicies((JpaToscaPolicies) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
- try {
- new JpaToscaPolicies(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicies(null, null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaPolicies(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicies(new PfConceptKey(), null))
+ .hasMessage("conceptMap is marked @NonNull but is null");
- try {
- new JpaToscaPolicies(null, new TreeMap<PfConceptKey, JpaToscaPolicy>());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicies(null, new TreeMap<PfConceptKey, JpaToscaPolicy>()))
+ .hasMessage(KEY_IS_NULL);
List<Map<String, ToscaPolicy>> polMapList = new ArrayList<>();
polMapList.add(new LinkedHashMap<>());
/*-
* ============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.
*/
public class JpaToscaPolicyTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testPolicyPojo() {
assertNotNull(new JpaToscaPolicy());
assertThatThrownBy(() -> {
new JpaToscaPolicy((PfConceptKey) null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaPolicy(null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaPolicy(new PfConceptKey(), null);
assertThatThrownBy(() -> {
new JpaToscaPolicy(null, new PfConceptKey());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaPolicy((JpaToscaPolicy) null);
}).hasMessage("copyConcept is marked @NonNull but is null");
- PfConceptKey tpKey = new PfConceptKey("tdt", "0.0.1");
- PfConceptKey ptKey = new PfConceptKey("policyType", "0.0.1");
+ PfConceptKey tpKey = new PfConceptKey("tdt", VERSION_001);
+ PfConceptKey ptKey = new PfConceptKey("policyType", VERSION_001);
JpaToscaPolicy tp = new JpaToscaPolicy(tpKey, ptKey);
Map<String, String> propertyMap = new HashMap<>();
assertEquals(propertyMap, tp.getProperties());
List<PfConceptKey> targets = new ArrayList<>();
- PfConceptKey target = new PfConceptKey("target", "0.0.1");
+ PfConceptKey target = new PfConceptKey("target", VERSION_001);
targets.add(target);
tp.setTargets(targets);
assertEquals(targets, tp.getTargets());
assertEquals(0, tp.compareTo(tp));
assertFalse(tp.compareTo(tp.getKey()) == 0);
- PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
+ PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaPolicy otherDt = new JpaToscaPolicy(otherDtKey);
assertFalse(tp.compareTo(otherDt) == 0);
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaEntityType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaProperty;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger;
/**
* DAO test for ToscaPolicyType.
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class JpaToscaPolicyTypeTest {
+ private static final String A_DESCRIPTION = "A Description";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testPolicyTypePojo() {
assertNotNull(new JpaToscaPolicyType());
assertNotNull(new JpaToscaPolicyType(new PfConceptKey()));
assertNotNull(new JpaToscaPolicyType(new JpaToscaPolicyType()));
- try {
- new JpaToscaPolicyType((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaPolicyType((JpaToscaPolicyType) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey ptKey = new PfConceptKey("tdt", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaPolicyType((PfConceptKey) null))
+ .hasMessage("key is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaPolicyType((JpaToscaPolicyType) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey ptKey = new PfConceptKey("tdt", VERSION_001);
JpaToscaPolicyType tpt = new JpaToscaPolicyType(ptKey);
- PfConceptKey derivedFromKey = new PfConceptKey("deriveFrom", "0.0.1");
+ PfConceptKey derivedFromKey = new PfConceptKey("deriveFrom", VERSION_001);
tpt.setDerivedFrom(derivedFromKey);
Map<String, String> metadata = new HashMap<>();
tpt.setMetadata(metadata);
assertEquals(metadata, tpt.getMetadata());
- tpt.setDescription("A Description");
+ tpt.setDescription(A_DESCRIPTION);
- PfConceptKey propTypeKey = new PfConceptKey("propType", "0.0.1");
+ PfConceptKey propTypeKey = new PfConceptKey("propType", VERSION_001);
Map<String, JpaToscaProperty> properties = new LinkedHashMap<>();
JpaToscaProperty tp = new JpaToscaProperty(new PfReferenceKey(ptKey, "aProp"), propTypeKey);
properties.put(tp.getKey().getLocalName(), tp);
assertEquals(properties, tpt.getProperties());
List<PfConceptKey> targets = new ArrayList<>();
- PfConceptKey target = new PfConceptKey("target", "0.0.1");
+ PfConceptKey target = new PfConceptKey("target", VERSION_001);
targets.add(target);
tpt.setTargets(targets);
assertEquals(targets, tpt.getTargets());
assertEquals(0, tpt.compareTo(tpt));
assertFalse(tpt.compareTo(tpt.getKey()) == 0);
- PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
+ PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaPolicyType otherDt = new JpaToscaPolicyType(otherDtKey);
assertFalse(tpt.compareTo(otherDt) == 0);
assertFalse(tpt.compareTo(otherDt) == 0);
otherDt.setMetadata(metadata);
assertFalse(tpt.compareTo(otherDt) == 0);
- otherDt.setDescription("A Description");
+ otherDt.setDescription(A_DESCRIPTION);
assertFalse(tpt.compareTo(otherDt) == 0);
otherDt.setProperties(properties);
assertFalse(tpt.compareTo(otherDt) == 0);
otherDt.setTriggers(triggers);
assertEquals(0, tpt.compareTo(otherDt));
- try {
- tpt.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tpt.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(6, tpt.getKeys().size());
assertEquals(1, new JpaToscaPolicyType().getKeys().size());
tpt.setDescription("");;
assertFalse(tpt.validate(new PfValidationResult()).isValid());
- tpt.setDescription("A Description");
+ tpt.setDescription(A_DESCRIPTION);
assertTrue(tpt.validate(new PfValidationResult()).isValid());
tpt.setDerivedFrom(PfConceptKey.getNullKey());
tpt.setDerivedFrom(derivedFromKey);
assertTrue(tpt.validate(new PfValidationResult()).isValid());
- try {
- tpt.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEntityType<ToscaPolicy>((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaEntityType<ToscaPolicy>((JpaToscaEntityType<ToscaPolicy>) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- JpaToscaEntityType<ToscaPolicy> tet = new JpaToscaEntityType<ToscaPolicy>(tpt.getKey());
+ assertThatThrownBy(() -> tpt.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaEntityType<ToscaPolicy>((PfConceptKey) null))
+ .hasMessage("key is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaEntityType<ToscaPolicy>((JpaToscaEntityType<ToscaPolicy>) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ JpaToscaEntityType<ToscaPolicy> tet = new JpaToscaEntityType<>(tpt.getKey());
assertEquals(-1, tet.compareTo(null));
assertEquals(0, tet.compareTo(tet));
assertFalse(tet.compareTo(tet.getKey()) == 0);
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyTypes;
public class JpaToscaPolicyTypesTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+
@Test
public void testPolicyTypes() {
assertNotNull(new JpaToscaPolicyTypes());
assertNotNull(new JpaToscaPolicyTypes(new PfConceptKey(), new TreeMap<PfConceptKey, JpaToscaPolicyType>()));
assertNotNull(new JpaToscaPolicyTypes(new JpaToscaPolicyTypes()));
- try {
- new JpaToscaPolicyTypes((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicyTypes((PfConceptKey) null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaPolicyTypes((JpaToscaPolicyTypes) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicyTypes((JpaToscaPolicyTypes) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
- try {
- new JpaToscaPolicyTypes(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicyTypes(null, null)).hasMessage(KEY_IS_NULL);
- try {
- new JpaToscaPolicyTypes(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("conceptMap is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicyTypes(new PfConceptKey(), null))
+ .hasMessage("conceptMap is marked @NonNull but is null");
- try {
- new JpaToscaPolicyTypes(null, new TreeMap<PfConceptKey, JpaToscaPolicyType>());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaPolicyTypes(null, new TreeMap<PfConceptKey, JpaToscaPolicyType>()))
+ .hasMessage(KEY_IS_NULL);
List<Map<String, ToscaPolicyType>> ptMapList = new ArrayList<>();
ptMapList.add(new LinkedHashMap<>());
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraint;
/**
* DAO test for ToscaProperty.
*/
public class JpaToscaPropertyTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String DEFAULT_KEY = "defaultKey";
+ private static final String A_DESCRIPTION = "A Description";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testPropertyPojo() {
assertNotNull(new JpaToscaProperty());
assertNotNull(new JpaToscaProperty(new PfReferenceKey(), new PfConceptKey()));
assertNotNull(new JpaToscaProperty(new JpaToscaProperty()));
- try {
- new JpaToscaProperty((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(null, new PfConceptKey());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty(new PfReferenceKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("type is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaProperty((JpaToscaProperty) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey pparentKey = new PfConceptKey("tParentKey", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaProperty((PfReferenceKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(null, new PfConceptKey())).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaProperty(new PfReferenceKey(), null))
+ .hasMessage("type is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaProperty((JpaToscaProperty) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey pparentKey = new PfConceptKey("tParentKey", VERSION_001);
PfReferenceKey pkey = new PfReferenceKey(pparentKey, "trigger0");
- PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", "0.0.1");
+ PfConceptKey ptypeKey = new PfConceptKey("TTypeKey", VERSION_001);
JpaToscaProperty tp = new JpaToscaProperty(pkey, ptypeKey);
- tp.setDescription("A Description");
- assertEquals("A Description", tp.getDescription());
+ tp.setDescription(A_DESCRIPTION);
+ assertEquals(A_DESCRIPTION, tp.getDescription());
tp.setRequired(false);
assertFalse(tp.isRequired());
- tp.setDefaultValue("defaultKey");
+ tp.setDefaultValue(DEFAULT_KEY);
tp.setStatus(ToscaProperty.Status.SUPPORTED);
tp.setConstraints(constraints);
assertEquals(constraints, tp.getConstraints());
- PfConceptKey typeKey = new PfConceptKey("type", "0.0.1");
+ PfConceptKey typeKey = new PfConceptKey("type", VERSION_001);
JpaToscaEntrySchema tes = new JpaToscaEntrySchema(typeKey);
tp.setEntrySchema(tes);
assertEquals(0, tp.compareTo(tp));
assertFalse(tp.compareTo(tp.getKey()) == 0);
- PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherProperty");
+ PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", VERSION_001, "OtherProperty");
JpaToscaProperty otherDt = new JpaToscaProperty(otherDtKey);
assertFalse(tp.compareTo(otherDt) == 0);
assertFalse(tp.compareTo(otherDt) == 0);
otherDt.setType(ptypeKey);
assertFalse(tp.compareTo(otherDt) == 0);
- otherDt.setDescription("A Description");
+ otherDt.setDescription(A_DESCRIPTION);
assertFalse(tp.compareTo(otherDt) == 0);
otherDt.setRequired(false);
assertFalse(tp.compareTo(otherDt) == 0);
- otherDt.setDefaultValue("defaultKey");
+ otherDt.setDefaultValue(DEFAULT_KEY);
assertFalse(tp.compareTo(otherDt) == 0);
otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
assertFalse(tp.compareTo(otherDt) == 0);
otherDt.setStatus(ToscaProperty.Status.SUPPORTED);
assertEquals(0, tp.compareTo(otherDt));
- try {
- tp.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tp.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(3, tp.getKeys().size());
assertEquals(2, new JpaToscaProperty().getKeys().size());
assertTrue(tp.validate(new PfValidationResult()).isValid());
tp.setDescription("");
assertFalse(tp.validate(new PfValidationResult()).isValid());
- tp.setDescription("A Description");
+ tp.setDescription(A_DESCRIPTION);
assertTrue(tp.validate(new PfValidationResult()).isValid());
tp.setType(null);
assertTrue(tp.validate(new PfValidationResult()).isValid());
tp.setDefaultValue("");
assertFalse(tp.validate(new PfValidationResult()).isValid());
- tp.setDefaultValue("defaultKey");
+ tp.setDefaultValue(DEFAULT_KEY);
assertTrue(tp.validate(new PfValidationResult()).isValid());
tp.getConstraints().add(null);
tp.getConstraints().remove(null);
assertTrue(tp.validate(new PfValidationResult()).isValid());
- try {
- tp.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tp.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyTypes;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate;
/**
* DAO test for ToscaDatatype.
*/
public class JpaToscaServiceTemplateTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testServiceTemplatePojo() {
assertNotNull(new JpaToscaServiceTemplate());
assertNotNull(new JpaToscaServiceTemplate(new PfConceptKey(), ""));
assertNotNull(new JpaToscaServiceTemplate(new JpaToscaServiceTemplate()));
- try {
- new JpaToscaServiceTemplate((PfConceptKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaServiceTemplate(null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaServiceTemplate(null, "");
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaServiceTemplate(new PfConceptKey(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("toscaDefinitionsVersion is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey tstKey = new PfConceptKey("tst", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate((PfConceptKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate(null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate(null, "")).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate(new PfConceptKey(), null))
+ .hasMessage("toscaDefinitionsVersion is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey tstKey = new PfConceptKey("tst", VERSION_001);
JpaToscaServiceTemplate tst = new JpaToscaServiceTemplate(tstKey, "Tosca Version");
- PfConceptKey dataTypeKey = new PfConceptKey("DataType", "0.0.1");
+ PfConceptKey dataTypeKey = new PfConceptKey("DataType", VERSION_001);
JpaToscaDataType dataType0 = new JpaToscaDataType(dataTypeKey);
- PfConceptKey dtsKey = new PfConceptKey("dts", "0.0.1");
+ PfConceptKey dtsKey = new PfConceptKey("dts", VERSION_001);
Map<PfConceptKey, JpaToscaDataType> dataTypeMap = new TreeMap<>();
dataTypeMap.put(dataTypeKey, dataType0);
JpaToscaDataTypes dataTypes = new JpaToscaDataTypes(dtsKey, dataTypeMap);
tst.setDataTypes(dataTypes);
assertEquals(dataTypes, tst.getDataTypes());
- PfConceptKey policyTypeKey = new PfConceptKey("DataType", "0.0.1");
+ PfConceptKey policyTypeKey = new PfConceptKey("DataType", VERSION_001);
JpaToscaPolicyType policyType0 = new JpaToscaPolicyType(policyTypeKey);
- PfConceptKey ptsKey = new PfConceptKey("dts", "0.0.1");
+ PfConceptKey ptsKey = new PfConceptKey("dts", VERSION_001);
Map<PfConceptKey, JpaToscaPolicyType> policyTypeMap = new TreeMap<>();
policyTypeMap.put(policyTypeKey, policyType0);
JpaToscaPolicyTypes policyTypes = new JpaToscaPolicyTypes(ptsKey, policyTypeMap);
assertEquals(0, tst.compareTo(tst));
assertFalse(tst.compareTo(tst.getKey()) == 0);
- PfConceptKey otherDtKey = new PfConceptKey("otherDt", "0.0.1");
+ PfConceptKey otherDtKey = new PfConceptKey("otherDt", VERSION_001);
JpaToscaServiceTemplate otherDt = new JpaToscaServiceTemplate(otherDtKey);
assertFalse(tst.compareTo(otherDt) == 0);
otherDt.setTopologyTemplate(ttt);
assertEquals(0, tst.compareTo(otherDt));
- try {
- tst.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tst.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(6, tst.getKeys().size());
assertEquals(1, new JpaToscaServiceTemplate().getKeys().size());
tst.setDescription("A Description");
assertTrue(tst.validate(new PfValidationResult()).isValid());
- try {
- tst.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tst.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
public class JpaToscaServiceTemplatesTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+
@Test
public void testServiceTemplates() {
assertNotNull(new JpaToscaServiceTemplates());
assertThatThrownBy(() -> {
new JpaToscaServiceTemplates((PfConceptKey) null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaServiceTemplates((JpaToscaServiceTemplates) null);
assertThatThrownBy(() -> {
new JpaToscaServiceTemplates(null, null);
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
assertThatThrownBy(() -> {
new JpaToscaServiceTemplates(new PfConceptKey(), null);
assertThatThrownBy(() -> {
new JpaToscaServiceTemplates(null, new TreeMap<PfConceptKey, JpaToscaServiceTemplate>());
- }).hasMessage("key is marked @NonNull but is null");
+ }).hasMessage(KEY_IS_NULL);
List<Map<String, ToscaServiceTemplate>> tsMapList = new ArrayList<>();
tsMapList.add(new LinkedHashMap<>());
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Date;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTimeInterval;
/**
* DAO test for ToscaTimeInterval.
*/
public class JpaToscaTimeIntervalTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+
@Test
public void testTimeIntervalPojo() {
assertNotNull(new JpaToscaTimeInterval());
assertNotNull(new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), new Date()));
assertNotNull(new JpaToscaTimeInterval(new JpaToscaTimeInterval()));
- try {
- new JpaToscaTimeInterval((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, null, new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, new Date(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, new Date(), new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("endTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval((JpaToscaTimeInterval) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaTimeInterval((PfReferenceKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, new Date())).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), new Date())).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, null))
+ .hasMessage("startTime is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date()))
+ .hasMessage("startTime is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null))
+ .hasMessage("endTime is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval((JpaToscaTimeInterval) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
PfConceptKey ttiParentKey = new PfConceptKey("tParentKey", "0.0.1");
PfReferenceKey ttiKey = new PfReferenceKey(ttiParentKey, "trigger0");
otherDt.setEndTime(endTime);
assertEquals(0, tti.compareTo(otherDt));
- try {
- tti.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tti.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(1, tti.getKeys().size());
assertEquals(1, new JpaToscaTimeInterval().getKeys().size());
tti.setEndTime(endTime);
assertTrue(tti.validate(new PfValidationResult()).isValid());
- try {
- tti.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tti.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Map;
import java.util.TreeMap;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicies;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicy;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate;
/**
* DAO test for ToscaDatatype.
*/
public class JpaToscaTopologyTemplateTest {
+ private static final String A_DESCRIPTION = "A Description";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testTopologyTemplatePojo() {
assertNotNull(new JpaToscaTopologyTemplate());
assertNotNull(new JpaToscaTopologyTemplate(new JpaToscaTopologyTemplate()));
assertNotNull(new JpaToscaTopologyTemplate(new ToscaTopologyTemplate()));
- try {
- new JpaToscaTopologyTemplate((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTopologyTemplate((JpaToscaTopologyTemplate) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfReferenceKey tttKey = new PfReferenceKey("tst", "0.0.1", "ttt");
+ assertThatThrownBy(() -> new JpaToscaTopologyTemplate((PfReferenceKey) null))
+ .hasMessage("key is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTopologyTemplate((JpaToscaTopologyTemplate) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfReferenceKey tttKey = new PfReferenceKey("tst", VERSION_001, "ttt");
JpaToscaTopologyTemplate ttt = new JpaToscaTopologyTemplate(tttKey);
- ttt.setDescription("A Description");
- assertEquals("A Description", ttt.getDescription());
+ ttt.setDescription(A_DESCRIPTION);
+ assertEquals(A_DESCRIPTION, ttt.getDescription());
- PfConceptKey policy0TypeKey = new PfConceptKey("Policy0Type", "0.0.1");
- PfConceptKey policy0Key = new PfConceptKey("Policy0", "0.0.1");
+ PfConceptKey policy0TypeKey = new PfConceptKey("Policy0Type", VERSION_001);
+ PfConceptKey policy0Key = new PfConceptKey("Policy0", VERSION_001);
JpaToscaPolicy policy0 = new JpaToscaPolicy(policy0Key, policy0TypeKey);
- PfConceptKey polsKey = new PfConceptKey("pols", "0.0.1");
+ PfConceptKey polsKey = new PfConceptKey("pols", VERSION_001);
Map<PfConceptKey, JpaToscaPolicy> policyMap = new TreeMap<>();
policyMap.put(policy0Key, policy0);
JpaToscaPolicies policies = new JpaToscaPolicies(polsKey, policyMap);
assertEquals(0, ttt.compareTo(ttt));
assertFalse(ttt.compareTo(ttt.getKey()) == 0);
- PfReferenceKey otherDtKey = new PfReferenceKey("otherSt", "0.0.1", "otherDt");
+ PfReferenceKey otherDtKey = new PfReferenceKey("otherSt", VERSION_001, "otherDt");
JpaToscaTopologyTemplate otherDt = new JpaToscaTopologyTemplate(otherDtKey);
assertFalse(ttt.compareTo(otherDt) == 0);
otherDt.setKey(tttKey);
assertFalse(ttt.compareTo(otherDt) == 0);
- otherDt.setDescription("A Description");
+ otherDt.setDescription(A_DESCRIPTION);
assertFalse(ttt.compareTo(otherDt) == 0);
otherDt.setPolicies(policies);
assertEquals(0, ttt.compareTo(otherDt));
- try {
- ttt.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> ttt.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(4, ttt.getKeys().size());
assertEquals(1, new JpaToscaTopologyTemplate().getKeys().size());
assertTrue(ttt.validate(new PfValidationResult()).isValid());
ttt.setDescription("");
assertFalse(ttt.validate(new PfValidationResult()).isValid());
- ttt.setDescription("A Description");
+ ttt.setDescription(A_DESCRIPTION);
assertTrue(ttt.validate(new PfValidationResult()).isValid());
- try {
- ttt.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> ttt.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.time.Duration;
import java.util.Date;
-
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaEventFilter;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTimeInterval;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger;
/**
* DAO test for ToscaTrigger.
*/
public class JpaToscaTriggerTest {
+ private static final String KEY_IS_NULL = "key is marked @NonNull but is null";
+ private static final String EVENT_TYPE = "EventType";
+ private static final String ACTION = "Action";
+ private static final String A_METHOD = "A Method";
+ private static final String A_DESCRIPTION = "A Description";
+ private static final String VERSION_001 = "0.0.1";
+
@Test
public void testTriggerPojo() {
assertNotNull(new JpaToscaTrigger());
assertNotNull(new JpaToscaTrigger(new PfReferenceKey()));
- assertNotNull(new JpaToscaTrigger(new PfReferenceKey(), "EventType", "Action"));
+ assertNotNull(new JpaToscaTrigger(new PfReferenceKey(), EVENT_TYPE, ACTION));
assertNotNull(new JpaToscaTrigger(new JpaToscaTrigger()));
- try {
- new JpaToscaTrigger((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(null, null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(null, "EventType", null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(null, "EventType", "Action");
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(null, null, "Action");
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(new PfReferenceKey(), null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("eventType is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(new PfReferenceKey(), "EventType", null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("action is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger(new PfReferenceKey(), null, "Action");
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("eventType is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTrigger((JpaToscaTrigger) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
-
- PfConceptKey tparentKey = new PfConceptKey("tParentKey", "0.0.1");
+ assertThatThrownBy(() -> new JpaToscaTrigger((PfReferenceKey) null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(null, null, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(null, EVENT_TYPE, null)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(null, EVENT_TYPE, ACTION)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(null, null, ACTION)).hasMessage(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(new PfReferenceKey(), null, null))
+ .hasMessage("eventType is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(new PfReferenceKey(), EVENT_TYPE, null))
+ .hasMessage("action is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTrigger(new PfReferenceKey(), null, ACTION))
+ .hasMessage("eventType is marked @NonNull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTrigger((JpaToscaTrigger) null))
+ .hasMessage("copyConcept is marked @NonNull but is null");
+
+ PfConceptKey tparentKey = new PfConceptKey("tParentKey", VERSION_001);
PfReferenceKey tkey = new PfReferenceKey(tparentKey, "trigger0");
- JpaToscaTrigger tdt = new JpaToscaTrigger(tkey, "EventType", "Action");
+ JpaToscaTrigger tdt = new JpaToscaTrigger(tkey, EVENT_TYPE, ACTION);
JpaToscaTimeInterval schedule =
new JpaToscaTimeInterval(new PfReferenceKey(tkey, "sched"), new Date(), new Date());
tdt.setSchedule(schedule);
JpaToscaEventFilter targetFilter =
- new JpaToscaEventFilter(new PfReferenceKey(tkey, "filter"), new PfConceptKey("NodeName", "0.0.1"));
+ new JpaToscaEventFilter(new PfReferenceKey(tkey, "filter"), new PfConceptKey("NodeName", VERSION_001));
tdt.setTargetFilter(targetFilter);
JpaToscaConstraintLogical lsc = new JpaToscaConstraintLogical(JpaToscaConstraintOperation.EQ, "hello");
tdt.setPeriod(Duration.ZERO);
assertEquals(Duration.ZERO, tdt.getPeriod());
- tdt.setDescription("A Description");
- assertEquals("A Description", tdt.getDescription());
+ tdt.setDescription(A_DESCRIPTION);
+ assertEquals(A_DESCRIPTION, tdt.getDescription());
- tdt.setMethod("A Method");
- assertEquals("A Method", tdt.getMethod());
+ tdt.setMethod(A_METHOD);
+ assertEquals(A_METHOD, tdt.getMethod());
JpaToscaTrigger tdtClone0 = new JpaToscaTrigger(tdt);
assertEquals(tdt, tdtClone0);
assertEquals(0, tdt.compareTo(tdt));
assertFalse(tdt.compareTo(tdt.getKey()) == 0);
- PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherTrigger");
+ PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", VERSION_001, "OtherTrigger");
JpaToscaTrigger otherDt = new JpaToscaTrigger(otherDtKey);
assertFalse(tdt.compareTo(otherDt) == 0);
otherDt.setKey(tkey);
assertFalse(tdt.compareTo(otherDt) == 0);
- otherDt.setDescription("A Description");
+ otherDt.setDescription(A_DESCRIPTION);
assertFalse(tdt.compareTo(otherDt) == 0);
- otherDt.setEventType("EventType");
+ otherDt.setEventType(EVENT_TYPE);
assertFalse(tdt.compareTo(otherDt) == 0);
otherDt.setSchedule(schedule);
assertFalse(tdt.compareTo(otherDt) == 0);
assertFalse(tdt.compareTo(otherDt) == 0);
otherDt.setPeriod(Duration.ZERO);
assertFalse(tdt.compareTo(otherDt) == 0);
- otherDt.setMethod("A Method");
+ otherDt.setMethod(A_METHOD);
assertFalse(tdt.compareTo(otherDt) == 0);
- otherDt.setAction("Action");
+ otherDt.setAction(ACTION);
assertEquals(0, tdt.compareTo(otherDt));
otherDt.setEvaluations(100);
otherDt.setEvaluations(0);
assertEquals(0, tdt.compareTo(otherDt));
- try {
- tdt.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tdt.copyTo(null)).hasMessage("target is marked @NonNull but is null");
assertEquals(4, tdt.getKeys().size());
assertEquals(1, new JpaToscaTrigger().getKeys().size());
assertTrue(tdt.validate(new PfValidationResult()).isValid());
tdt.setDescription("");
assertFalse(tdt.validate(new PfValidationResult()).isValid());
- tdt.setDescription("A Description");
+ tdt.setDescription(A_DESCRIPTION);
assertTrue(tdt.validate(new PfValidationResult()).isValid());
tdt.setEvaluations(-1);
assertTrue(tdt.validate(new PfValidationResult()).isValid());
tdt.setMethod("");
assertFalse(tdt.validate(new PfValidationResult()).isValid());
- tdt.setMethod("A Method");
+ tdt.setMethod(A_METHOD);
assertTrue(tdt.validate(new PfValidationResult()).isValid());
- try {
- tdt.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> tdt.validate(null)).hasMessage("resultIn is marked @NonNull but is null");
}
}
/*-
* ============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.
* The Default Constructor creates a {@link DummyToscaConstraint} object with a null key.
*/
public DummyToscaConstraint() {
+ // do nothing
}
@Override
@Override
public void fromAuthorative(ToscaConstraint authorativeConcept) {
+ // do nothing
}
@Override
/*-
* ============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.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.Properties;
-
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.junit.After;
import org.junit.Before;
* @author Liam Fallon (liam.fallon@est.tech)
*/
public class SimpleToscaProviderTest {
+ private static final String TEMPLATE_IS_NULL = "serviceTemplate is marked @NonNull but is null";
+ private static final String VCPE_INPUT_JSON = "policies/vCPE.policy.monitoring.input.tosca.json";
+ private static final String DAO_IS_NULL = "dao is marked @NonNull but is null";
private PfDao pfDao;
private StandardCoder standardCoder;
}
@After
- public void teardown() throws Exception {
+ public void teardown() {
pfDao.close();
}
@Test
public void testPoliciesGet() throws Exception {
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
ToscaServiceTemplate.class);
createPolicyTypes();
@Test
public void testPolicyCreate() throws Exception {
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
ToscaServiceTemplate.class);
createPolicyTypes();
@Test
public void testPolicyUpdate() throws Exception {
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
ToscaServiceTemplate.class);
createPolicyTypes();
@Test
public void testPoliciesDelete() throws Exception {
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ResourceUtils.getResourceAsString(VCPE_INPUT_JSON),
ToscaServiceTemplate.class);
createPolicyTypes();
}
@Test
- public void testAssertPoliciesExist() throws PfModelException {
+ public void testAssertPoliciesExist() {
JpaToscaServiceTemplate testServiceTemplate = new JpaToscaServiceTemplate();
- try {
- new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("topology template not specified on service template", exc.getMessage());
- }
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("topology template not specified on service template");
testServiceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
- try {
- new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("no policies specified on topology template of service template", exc.getMessage());
- }
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("no policies specified on topology template of service template");
testServiceTemplate.getTopologyTemplate().setPolicies(new JpaToscaPolicies());
- try {
- new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate);
- fail("test should throw an exception here");
- } catch (Exception exc) {
- assertEquals("list of policies specified on topology template of service template is empty",
- exc.getMessage());
- }
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("list of policies specified on topology template of service template is empty");
}
@Test
public void testNonNulls() {
assertThatThrownBy(() -> {
new SimpleToscaProvider().getPolicyTypes(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicyTypes(null, new JpaToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicyTypes(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ }).hasMessage(TEMPLATE_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicyTypes(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicyTypes(null, new JpaToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicyTypes(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ }).hasMessage(TEMPLATE_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicyType(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicyType(null, new PfConceptKey());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicyType(pfDao, null);
assertThatThrownBy(() -> {
new SimpleToscaProvider().getPolicies(null, null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicies(null, new JpaToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().createPolicies(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ }).hasMessage(TEMPLATE_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicies(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicies(null, new JpaToscaServiceTemplate());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().updatePolicies(pfDao, null);
- }).hasMessage("serviceTemplate is marked @NonNull but is null");
+ }).hasMessage(TEMPLATE_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicy(null, null);
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicy(null, new PfConceptKey());
- }).hasMessage("dao is marked @NonNull but is null");
+ }).hasMessage(DAO_IS_NULL);
assertThatThrownBy(() -> {
new SimpleToscaProvider().deletePolicy(pfDao, null);
*/
public class MonitoringPolicySerializationTest {
+ private static final String VERSION = "version";
+
+ private static final String YAML_VERSION = "tosca_simple_yaml_1_0_0";
+
+ private static final String DEFINITION_VERSION = "tosca_definitions_version";
+
+ private static final String TOPOLOGY_TEMPLATE = "topology_template";
+
+ private static final String TCA_POLICY = "tca_policy";
+
+ private static final String PROPERTIES2 = "properties";
+
+ private static final String POLICY_ID = "policy-id";
+
+ private static final String POLICIES = "policies";
+
+ private static final String POLICY3 = "onap.vfirewall.tca";
+
+ private static final String POLICY2 = "onap.scaleout.tca";
+
+ private static final String POLICY1 = "onap.restart.tca";
+
+ private static final String TYPE1 = "onap.policies.monitoring.cdap.tca.hi.lo.app";
+
+ private static final String METADATA = "metadata";
+
+ private static final String VERSION_100 = "1.0.0";
+
private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringPolicySerializationTest.class);
private static final String VCPE_MON_INPUT_JSON = "policies/vCPE.policy.monitoring.input.tosca.json";
}
@Test
- public void testDeserialization() {
- try {
- // vCPE
- JpaToscaServiceTemplate serviceTemplateFromJson = deserializeMonitoringInputJson(VCPE_MON_INPUT_JSON);
- verifyVcpeMonitoringInputDeserialization(serviceTemplateFromJson);
- JpaToscaServiceTemplate serviceTemplateFromYaml = deserializeMonitoringInputYaml(VCPE_MON_INPUT_YAML);
- assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
-
- // vDNS
- serviceTemplateFromJson = deserializeMonitoringInputJson(VDNS_MON_INPUT_JSON);
- verifyVdnsMonitoringInputDeserialization(serviceTemplateFromJson);
- serviceTemplateFromYaml = deserializeMonitoringInputYaml(VDNS_MON_INPUT_YAML);
- assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
-
- // vFirewall
- serviceTemplateFromJson = deserializeMonitoringInputJson(VFW_MON_INPUT_JSON);
- verifyVfwMonitoringInputDeserialization(serviceTemplateFromJson);
- serviceTemplateFromYaml = deserializeMonitoringInputYaml(VFW_MON_INPUT_YAML);
- assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
-
- } catch (Exception e) {
- LOGGER.warn("No exception should be thrown", e);
- fail("No exception should be thrown");
- }
+ public void testDeserialization() throws Exception {
+ // vCPE
+ JpaToscaServiceTemplate serviceTemplateFromJson = deserializeMonitoringInputJson(VCPE_MON_INPUT_JSON);
+ verifyVcpeMonitoringInputDeserialization(serviceTemplateFromJson);
+ JpaToscaServiceTemplate serviceTemplateFromYaml = deserializeMonitoringInputYaml(VCPE_MON_INPUT_YAML);
+ assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
+
+ // vDNS
+ serviceTemplateFromJson = deserializeMonitoringInputJson(VDNS_MON_INPUT_JSON);
+ verifyVdnsMonitoringInputDeserialization(serviceTemplateFromJson);
+ serviceTemplateFromYaml = deserializeMonitoringInputYaml(VDNS_MON_INPUT_YAML);
+ assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
+
+ // vFirewall
+ serviceTemplateFromJson = deserializeMonitoringInputJson(VFW_MON_INPUT_JSON);
+ verifyVfwMonitoringInputDeserialization(serviceTemplateFromJson);
+ serviceTemplateFromYaml = deserializeMonitoringInputYaml(VFW_MON_INPUT_YAML);
+ assertTrue(serviceTemplateFromJson.compareTo(serviceTemplateFromYaml) == 0);
}
@Test
assertTrue(serviceTemplate.validate(new PfValidationResult()).isValid());
// Check tosca_definitions_version
- assertEquals("tosca_simple_yaml_1_0_0",
+ assertEquals(YAML_VERSION,
serviceTemplate.getToscaDefinitionsVersion());
Map<PfConceptKey, JpaToscaPolicy> policiesConceptMap = serviceTemplate.getTopologyTemplate()
// Check policies
assertTrue(policiesConceptMap.size() == 1);
- assertEquals("onap.restart.tca", policiesConceptMap.keySet().iterator().next().getName());
+ assertEquals(POLICY1, policiesConceptMap.keySet().iterator().next().getName());
assertEquals("onap.restart.tca:1.0.0",
- serviceTemplate.getTopologyTemplate().getPolicies().get("onap.restart.tca").getId());
+ serviceTemplate.getTopologyTemplate().getPolicies().get(POLICY1).getId());
JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
// Check metadata
assertTrue(policyVal.getMetadata().size() == 2);
- assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
- assertEquals("onap.restart.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());
+ assertEquals(POLICY_ID, policyVal.getMetadata().entrySet().iterator().next().getKey());
+ assertEquals(POLICY1, policyVal.getMetadata().entrySet().iterator().next().getValue());
// Check properties
assertTrue(policiesConceptMap.values().iterator().next().getProperties().size() == 1);
- assertEquals("tca_policy", policyVal.getProperties().keySet().iterator().next());
+ assertEquals(TCA_POLICY, policyVal.getProperties().keySet().iterator().next());
assertNotNull(policyVal.getProperties().values().iterator().next());
}
assertTrue(serviceTemplate.validate(new PfValidationResult()).isValid());
// Check tosca_definitions_version
- assertEquals("tosca_simple_yaml_1_0_0",
+ assertEquals(YAML_VERSION,
serviceTemplate.getToscaDefinitionsVersion());
Map<PfConceptKey, JpaToscaPolicy> policiesConceptMap = serviceTemplate.getTopologyTemplate()
// Check policies
assertTrue(policiesConceptMap.size() == 1);
- assertEquals("onap.scaleout.tca", policiesConceptMap.keySet().iterator().next().getName());
+ assertEquals(POLICY2, policiesConceptMap.keySet().iterator().next().getName());
assertEquals("onap.scaleout.tca:1.0.0",
- serviceTemplate.getTopologyTemplate().getPolicies().get("onap.scaleout.tca").getId());
+ serviceTemplate.getTopologyTemplate().getPolicies().get(POLICY2).getId());
JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
// Check metadata
assertTrue(policyVal.getMetadata().size() == 2);
- assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
- assertEquals("onap.scaleout.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());
+ assertEquals(POLICY_ID, policyVal.getMetadata().entrySet().iterator().next().getKey());
+ assertEquals(POLICY2, policyVal.getMetadata().entrySet().iterator().next().getValue());
// Check properties
assertTrue(policiesConceptMap.values().iterator().next().getProperties().size() == 1);
- assertEquals("tca_policy", policyVal.getProperties().keySet().iterator().next());
+ assertEquals(TCA_POLICY, policyVal.getProperties().keySet().iterator().next());
assertNotNull(policyVal.getProperties().values().iterator().next());
}
assertTrue(serviceTemplate.validate(new PfValidationResult()).isValid());
// Check tosca_definitions_version
- assertEquals("tosca_simple_yaml_1_0_0",
+ assertEquals(YAML_VERSION,
serviceTemplate.getToscaDefinitionsVersion());
Map<PfConceptKey, JpaToscaPolicy> policiesConceptMap = serviceTemplate.getTopologyTemplate()
// Check policies
assertTrue(policiesConceptMap.size() == 1);
- assertEquals("onap.vfirewall.tca", policiesConceptMap.keySet().iterator().next().getName());
+ assertEquals(POLICY3, policiesConceptMap.keySet().iterator().next().getName());
assertEquals("onap.vfirewall.tca:1.0.0",
- serviceTemplate.getTopologyTemplate().getPolicies().get("onap.vfirewall.tca").getId());
+ serviceTemplate.getTopologyTemplate().getPolicies().get(POLICY3).getId());
JpaToscaPolicy policyVal = policiesConceptMap.values().iterator().next();
// Check metadata
assertTrue(policyVal.getMetadata().size() == 2);
- assertEquals("policy-id", policyVal.getMetadata().entrySet().iterator().next().getKey());
- assertEquals("onap.vfirewall.tca", policyVal.getMetadata().entrySet().iterator().next().getValue());
+ assertEquals(POLICY_ID, policyVal.getMetadata().entrySet().iterator().next().getKey());
+ assertEquals(POLICY3, policyVal.getMetadata().entrySet().iterator().next().getValue());
// Check properties
assertTrue(policiesConceptMap.values().iterator().next().getProperties().size() == 1);
- assertEquals("tca_policy", policyVal.getProperties().keySet().iterator().next());
+ assertEquals(TCA_POLICY, policyVal.getProperties().keySet().iterator().next());
assertNotNull(policyVal.getProperties().values().iterator().next());
}
private void verifyVcpeMonitoringOutputserialization(String serializedServiceTemplate) {
JsonObject serviceTemplateJsonObject = new JsonParser().parse(serializedServiceTemplate).getAsJsonObject();
- assertEquals("tosca_simple_yaml_1_0_0", serviceTemplateJsonObject.get("tosca_definitions_version")
+ assertEquals(YAML_VERSION, serviceTemplateJsonObject.get(DEFINITION_VERSION)
.getAsString());
- JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get("topology_template")
+ JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get(TOPOLOGY_TEMPLATE)
.getAsJsonObject();
- JsonArray policiesJsonArray = topologyTemplateJsonObject.get("policies").getAsJsonArray();
+ JsonArray policiesJsonArray = topologyTemplateJsonObject.get(POLICIES).getAsJsonArray();
assertTrue(policiesJsonArray.size() == 1);
JsonObject policy = policiesJsonArray.iterator().next().getAsJsonObject();
- assertNotNull(policy.get("onap.restart.tca"));
- JsonObject policyVal = policy.get("onap.restart.tca").getAsJsonObject();
- assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", policyVal.get("type").getAsString());
- assertEquals("1.0.0", policyVal.get("version").getAsString());
- assertEquals("onap.restart.tca", policyVal.get("metadata").getAsJsonObject().get("policy-id")
+ assertNotNull(policy.get(POLICY1));
+ JsonObject policyVal = policy.get(POLICY1).getAsJsonObject();
+ assertEquals(TYPE1, policyVal.get("type").getAsString());
+ assertEquals(VERSION_100, policyVal.get(VERSION).getAsString());
+ assertEquals(POLICY1, policyVal.get(METADATA).getAsJsonObject().get(POLICY_ID)
.getAsString());
- JsonObject properties = policyVal.get("properties").getAsJsonObject();
- assertNotNull(properties.get("tca_policy"));
+ JsonObject properties = policyVal.get(PROPERTIES2).getAsJsonObject();
+ assertNotNull(properties.get(TCA_POLICY));
}
private void verifyVdnsMonitoringOutputserialization(String serializedServiceTemplate) {
JsonObject serviceTemplateJsonObject = new JsonParser().parse(serializedServiceTemplate).getAsJsonObject();
- assertEquals("tosca_simple_yaml_1_0_0", serviceTemplateJsonObject.get("tosca_definitions_version")
+ assertEquals(YAML_VERSION, serviceTemplateJsonObject.get(DEFINITION_VERSION)
.getAsString());
- JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get("topology_template").getAsJsonObject();
- JsonArray policiesJsonArray = topologyTemplateJsonObject.get("policies").getAsJsonArray();
+ JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get(TOPOLOGY_TEMPLATE).getAsJsonObject();
+ JsonArray policiesJsonArray = topologyTemplateJsonObject.get(POLICIES).getAsJsonArray();
assertTrue(policiesJsonArray.size() == 1);
JsonObject policy = policiesJsonArray.iterator().next().getAsJsonObject();
- assertNotNull(policy.get("onap.scaleout.tca"));
- JsonObject policyVal = policy.get("onap.scaleout.tca").getAsJsonObject();
- assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", policyVal.get("type").getAsString());
- assertEquals("1.0.0", policyVal.get("version").getAsString());
- assertEquals("onap.scaleout.tca", policyVal.get("metadata").getAsJsonObject().get("policy-id")
+ assertNotNull(policy.get(POLICY2));
+ JsonObject policyVal = policy.get(POLICY2).getAsJsonObject();
+ assertEquals(TYPE1, policyVal.get("type").getAsString());
+ assertEquals(VERSION_100, policyVal.get(VERSION).getAsString());
+ assertEquals(POLICY2, policyVal.get(METADATA).getAsJsonObject().get(POLICY_ID)
.getAsString());
- JsonObject properties = policyVal.get("properties").getAsJsonObject();
- assertNotNull(properties.get("tca_policy"));
+ JsonObject properties = policyVal.get(PROPERTIES2).getAsJsonObject();
+ assertNotNull(properties.get(TCA_POLICY));
}
private void verifyVfwMonitoringOutputserialization(String serializedServiceTemplate) {
JsonObject serviceTemplateJsonObject = new JsonParser().parse(serializedServiceTemplate).getAsJsonObject();
- assertEquals("tosca_simple_yaml_1_0_0", serviceTemplateJsonObject.get("tosca_definitions_version")
+ assertEquals(YAML_VERSION, serviceTemplateJsonObject.get(DEFINITION_VERSION)
.getAsString());
- JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get("topology_template").getAsJsonObject();
- JsonArray policiesJsonArray = topologyTemplateJsonObject.get("policies").getAsJsonArray();
+ JsonObject topologyTemplateJsonObject = serviceTemplateJsonObject.get(TOPOLOGY_TEMPLATE).getAsJsonObject();
+ JsonArray policiesJsonArray = topologyTemplateJsonObject.get(POLICIES).getAsJsonArray();
assertTrue(policiesJsonArray.size() == 1);
JsonObject policy = policiesJsonArray.iterator().next().getAsJsonObject();
- assertNotNull(policy.get("onap.vfirewall.tca"));
- JsonObject policyVal = policy.get("onap.vfirewall.tca").getAsJsonObject();
- assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", policyVal.get("type").getAsString());
- assertEquals("1.0.0", policyVal.get("version").getAsString());
- assertEquals("onap.vfirewall.tca", policyVal.get("metadata").getAsJsonObject().get("policy-id")
+ assertNotNull(policy.get(POLICY3));
+ JsonObject policyVal = policy.get(POLICY3).getAsJsonObject();
+ assertEquals(TYPE1, policyVal.get("type").getAsString());
+ assertEquals(VERSION_100, policyVal.get(VERSION).getAsString());
+ assertEquals(POLICY3, policyVal.get(METADATA).getAsJsonObject().get(POLICY_ID)
.getAsString());
- JsonObject properties = policyVal.get("properties").getAsJsonObject();
- assertNotNull(properties.get("tca_policy"));
+ JsonObject properties = policyVal.get(PROPERTIES2).getAsJsonObject();
+ assertNotNull(properties.get(TCA_POLICY));
}
}
*/
public class MonitoringPolicyTypeSerializationTest {
+ private static final String DATATYPE_ROOT = "tosca.datatypes.Root";
+
+ private static final String STRING_TEXT = "string";
+
+ private static final String DCAE = "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server";
+
+ private static final String MONITORING = "onap.policies.Monitoring";
+
+ private static final String THRESHOLDS = "onap.datatypes.monitoring.thresholds";
+
+ private static final String TCA = "onap.datatypes.monitoring.tca_policy";
+
+ private static final String METRICS = "onap.datatypes.monitoring.metricsPerEventName";
+
+ private static final String VERSION_100 = "1.0.0";
+
+ private static final String VERSION_000 = "0.0.0";
+
private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringPolicyTypeSerializationTest.class);
private static final String MONITORING_TCA_YAML = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml";
}
@Test
- public void testDeserialization() {
- try {
- // TCA
- JpaToscaServiceTemplate serviceTemplateFromYaml = deserializeMonitoringInputYaml(MONITORING_TCA_YAML);
- verifyTcaInputDeserialization(serviceTemplateFromYaml);
-
- // Collector
- serviceTemplateFromYaml = deserializeMonitoringInputYaml(MONITORING_COLLECTORS_YAML);
- verifyCollectorInputDeserialization(serviceTemplateFromYaml);
-
- } catch (Exception e) {
- LOGGER.warn("No exception should be thrown", e);
- fail("No exception should be thrown");
- }
+ public void testDeserialization() throws Exception {
+ // TCA
+ JpaToscaServiceTemplate serviceTemplateFromYaml = deserializeMonitoringInputYaml(MONITORING_TCA_YAML);
+ verifyTcaInputDeserialization(serviceTemplateFromYaml);
+
+ // Collector
+ serviceTemplateFromYaml = deserializeMonitoringInputYaml(MONITORING_COLLECTORS_YAML);
+ verifyCollectorInputDeserialization(serviceTemplateFromYaml);
}
@Test
Iterator<Entry<PfConceptKey, JpaToscaPolicyType>> policyTypesIter = policyTypesConceptMap.entrySet().iterator();
Entry<PfConceptKey, JpaToscaPolicyType> firstPolicyType = policyTypesIter.next();
- assertEquals("onap.policies.Monitoring", firstPolicyType.getKey().getName());
- assertEquals("0.0.0", firstPolicyType.getKey().getVersion());
+ assertEquals(MONITORING, firstPolicyType.getKey().getName());
+ assertEquals(VERSION_000, firstPolicyType.getKey().getVersion());
assertEquals("tosca.policies.Root", firstPolicyType.getValue().getDerivedFrom().getName());
assertEquals("a base policy type for all policies that governs monitoring provisioning",
firstPolicyType.getValue().getDescription());
Entry<PfConceptKey, JpaToscaPolicyType> secondPolicyType = policyTypesIter.next();
assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", secondPolicyType.getKey().getName());
- assertEquals("1.0.0", secondPolicyType.getKey().getVersion());
- assertEquals("onap.policies.Monitoring", secondPolicyType.getValue().getDerivedFrom().getName());
+ assertEquals(VERSION_100, secondPolicyType.getKey().getVersion());
+ assertEquals(MONITORING, secondPolicyType.getValue().getDerivedFrom().getName());
assertTrue(secondPolicyType.getValue().getProperties().size() == 1);
JpaToscaProperty property = secondPolicyType.getValue().getProperties().values().iterator().next();
assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", property.getKey().getParentKeyName());
- assertEquals("1.0.0", property.getKey().getParentKeyVersion());
+ assertEquals(VERSION_100, property.getKey().getParentKeyVersion());
assertEquals("tca_policy", property.getKey().getLocalName());
assertEquals("map", property.getType().getName());
assertEquals("TCA Policy JSON", property.getDescription());
JpaToscaEntrySchema entrySchema = property.getEntrySchema();
- assertEquals("onap.datatypes.monitoring.tca_policy", entrySchema.getType().getName());
+ assertEquals(TCA, entrySchema.getType().getName());
// Check data_types
Map<PfConceptKey, JpaToscaDataType> dataTypesConceptMap = serviceTemplate.getDataTypes().getConceptMap();
Iterator<Entry<PfConceptKey, JpaToscaDataType>> dataTypesIter = dataTypesConceptMap.entrySet().iterator();
Entry<PfConceptKey, JpaToscaDataType> firstDataType = dataTypesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName", firstDataType.getKey().getName());
+ assertEquals(METRICS, firstDataType.getKey().getName());
JpaToscaDataType firstDataTypeVal = firstDataType.getValue();
- assertEquals("tosca.datatypes.Root", firstDataTypeVal.getDerivedFrom().getName());
- assertEquals("0.0.0", firstDataTypeVal.getDerivedFrom().getVersion());
+ assertEquals(DATATYPE_ROOT, firstDataTypeVal.getDerivedFrom().getName());
+ assertEquals(VERSION_000, firstDataTypeVal.getDerivedFrom().getVersion());
assertTrue(firstDataTypeVal.getProperties().size() == 6);
Iterator<JpaToscaProperty> firstDataTypePropertiesIter = firstDataTypeVal.getProperties().values().iterator();
JpaToscaProperty firstDataTypeFirstProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeFirstProperty.getKey().getParentKeyName());
assertEquals("controlLoopSchemaType", firstDataTypeFirstProperty.getKey().getLocalName());
- assertEquals("string", firstDataTypeFirstProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstDataTypeFirstProperty.getType().getName());
assertTrue(firstDataTypeFirstProperty.isRequired());
assertEquals("Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
firstDataTypeFirstProperty.getDescription());
.getValidValues().size() == 2);
JpaToscaProperty firstDataTypeSecondProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeSecondProperty.getKey().getParentKeyName());
assertEquals("eventName", firstDataTypeSecondProperty.getKey().getLocalName());
- assertEquals("string", firstDataTypeSecondProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstDataTypeSecondProperty.getType().getName());
assertTrue(firstDataTypeSecondProperty.isRequired());
assertEquals("Event name to which thresholds need to be applied", firstDataTypeSecondProperty.getDescription());
JpaToscaProperty firstDataTypeThirdProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeThirdProperty.getKey().getParentKeyName());
assertEquals("policyName", firstDataTypeThirdProperty.getKey().getLocalName());
- assertEquals("string", firstDataTypeThirdProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstDataTypeThirdProperty.getType().getName());
assertTrue(firstDataTypeThirdProperty.isRequired());
assertEquals("TCA Policy Scope Name", firstDataTypeThirdProperty.getDescription());
JpaToscaProperty firstDataTypeFourthProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeFourthProperty.getKey().getParentKeyName());
assertEquals("policyScope", firstDataTypeFourthProperty.getKey().getLocalName());
- assertEquals("string", firstDataTypeFourthProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstDataTypeFourthProperty.getType().getName());
assertTrue(firstDataTypeFourthProperty.isRequired());
assertEquals("TCA Policy Scope", firstDataTypeFourthProperty.getDescription());
JpaToscaProperty firstDataTypeFifthProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeFifthProperty.getKey().getParentKeyName());
assertEquals("policyVersion", firstDataTypeFifthProperty.getKey().getLocalName());
- assertEquals("string", firstDataTypeFifthProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstDataTypeFifthProperty.getType().getName());
assertTrue(firstDataTypeFifthProperty.isRequired());
assertEquals("TCA Policy Scope Version", firstDataTypeFifthProperty.getDescription());
JpaToscaProperty firstDataTypeSixthProperty = firstDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
firstDataTypeSixthProperty.getKey().getParentKeyName());
assertEquals("thresholds", firstDataTypeSixthProperty.getKey().getLocalName());
assertEquals("list", firstDataTypeSixthProperty.getType().getName());
assertTrue(firstDataTypeSixthProperty.isRequired());
assertEquals("Thresholds associated with eventName", firstDataTypeSixthProperty.getDescription());
assertNotNull(firstDataTypeSixthProperty.getEntrySchema());
- assertEquals("onap.datatypes.monitoring.thresholds",
+ assertEquals(THRESHOLDS,
firstDataTypeSixthProperty.getEntrySchema().getType().getName());
Entry<PfConceptKey, JpaToscaDataType> secondDataType = dataTypesIter.next();
- assertEquals("onap.datatypes.monitoring.tca_policy", secondDataType.getKey().getName());
+ assertEquals(TCA, secondDataType.getKey().getName());
JpaToscaDataType secondDataTypeVal = secondDataType.getValue();
- assertEquals("tosca.datatypes.Root", secondDataTypeVal.getDerivedFrom().getName());
- assertEquals("0.0.0", secondDataTypeVal.getDerivedFrom().getVersion());
+ assertEquals(DATATYPE_ROOT, secondDataTypeVal.getDerivedFrom().getName());
+ assertEquals(VERSION_000, secondDataTypeVal.getDerivedFrom().getVersion());
assertTrue(secondDataTypeVal.getProperties().size() == 2);
Iterator<JpaToscaProperty> secondDataTypePropertiesIter = secondDataTypeVal.getProperties().values().iterator();
JpaToscaProperty secondDataTypeFirstProperty = secondDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.tca_policy", secondDataTypeFirstProperty.getKey().getParentKeyName());
+ assertEquals(TCA, secondDataTypeFirstProperty.getKey().getParentKeyName());
assertEquals("domain", secondDataTypeFirstProperty.getKey().getLocalName());
- assertEquals("string", secondDataTypeFirstProperty.getType().getName());
+ assertEquals(STRING_TEXT, secondDataTypeFirstProperty.getType().getName());
assertTrue(secondDataTypeFirstProperty.isRequired());
assertEquals("Domain name to which TCA needs to be applied", secondDataTypeFirstProperty.getDescription());
assertEquals("measurementsForVfScaling", secondDataTypeFirstProperty.getDefaultValue());
.getCompareTo());
JpaToscaProperty secondDataTypeSecondProperty = secondDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.tca_policy", secondDataTypeSecondProperty.getKey().getParentKeyName());
+ assertEquals(TCA, secondDataTypeSecondProperty.getKey().getParentKeyName());
assertEquals("metricsPerEventName", secondDataTypeSecondProperty.getKey().getLocalName());
assertEquals("list", secondDataTypeSecondProperty.getType().getName());
assertTrue(secondDataTypeSecondProperty.isRequired());
assertEquals("Contains eventName and threshold details that need to be applied to given eventName",
secondDataTypeSecondProperty.getDescription());
assertNotNull(secondDataTypeSecondProperty.getEntrySchema());
- assertEquals("onap.datatypes.monitoring.metricsPerEventName",
+ assertEquals(METRICS,
secondDataTypeSecondProperty.getEntrySchema().getType().getName());
Entry<PfConceptKey, JpaToscaDataType> thirdDataType = dataTypesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataType.getKey().getName());
+ assertEquals(THRESHOLDS, thirdDataType.getKey().getName());
JpaToscaDataType thirdDataTypeVal = thirdDataType.getValue();
- assertEquals("tosca.datatypes.Root", thirdDataTypeVal.getDerivedFrom().getName());
- assertEquals("0.0.0", thirdDataTypeVal.getDerivedFrom().getVersion());
+ assertEquals(DATATYPE_ROOT, thirdDataTypeVal.getDerivedFrom().getName());
+ assertEquals(VERSION_000, thirdDataTypeVal.getDerivedFrom().getVersion());
assertTrue(thirdDataTypeVal.getProperties().size() == 7);
Iterator<JpaToscaProperty> thirdDataTypePropertiesIter = thirdDataTypeVal.getProperties().values().iterator();
JpaToscaProperty thirdDataTypeFirstProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeFirstProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeFirstProperty.getKey().getParentKeyName());
assertEquals("closedLoopControlName", thirdDataTypeFirstProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeFirstProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeFirstProperty.getType().getName());
assertTrue(thirdDataTypeFirstProperty.isRequired());
assertEquals("Closed Loop Control Name associated with the threshold",
thirdDataTypeFirstProperty.getDescription());
JpaToscaProperty thirdDataTypeSecondProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeSecondProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeSecondProperty.getKey().getParentKeyName());
assertEquals("closedLoopEventStatus", thirdDataTypeSecondProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeSecondProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeSecondProperty.getType().getName());
assertTrue(thirdDataTypeSecondProperty.isRequired());
assertEquals("Closed Loop Event Status of the threshold", thirdDataTypeSecondProperty.getDescription());
assertNotNull(thirdDataTypeSecondProperty.getConstraints());
.getValidValues().size() == 2);
JpaToscaProperty thirdDataTypeThirdProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeThirdProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeThirdProperty.getKey().getParentKeyName());
assertEquals("direction", thirdDataTypeThirdProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeThirdProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeThirdProperty.getType().getName());
assertTrue(thirdDataTypeThirdProperty.isRequired());
assertEquals("Direction of the threshold", thirdDataTypeThirdProperty.getDescription());
assertNotNull(thirdDataTypeThirdProperty.getConstraints());
.getValidValues().size() == 5);
JpaToscaProperty thirdDataTypeFourthProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeFourthProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeFourthProperty.getKey().getParentKeyName());
assertEquals("fieldPath", thirdDataTypeFourthProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeFourthProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeFourthProperty.getType().getName());
assertTrue(thirdDataTypeFourthProperty.isRequired());
assertEquals("Json field Path as per CEF message which needs to be analyzed for TCA",
thirdDataTypeFourthProperty.getDescription());
.getValidValues().size() == 43);
JpaToscaProperty thirdDataTypeFifthProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeFifthProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeFifthProperty.getKey().getParentKeyName());
assertEquals("severity", thirdDataTypeFifthProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeFifthProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeFifthProperty.getType().getName());
assertTrue(thirdDataTypeFifthProperty.isRequired());
assertEquals("Threshold Event Severity", thirdDataTypeFifthProperty.getDescription());
assertNotNull(thirdDataTypeFifthProperty.getConstraints());
.getValidValues().size() == 5);;
JpaToscaProperty thirdDataTypeSixthProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeSixthProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeSixthProperty.getKey().getParentKeyName());
assertEquals("thresholdValue", thirdDataTypeSixthProperty.getKey().getLocalName());
assertEquals("integer", thirdDataTypeSixthProperty.getType().getName());
assertTrue(thirdDataTypeSixthProperty.isRequired());
thirdDataTypeSixthProperty.getDescription());
JpaToscaProperty thirdDataTypeSeventhProperty = thirdDataTypePropertiesIter.next();
- assertEquals("onap.datatypes.monitoring.thresholds", thirdDataTypeSeventhProperty.getKey().getParentKeyName());
+ assertEquals(THRESHOLDS, thirdDataTypeSeventhProperty.getKey().getParentKeyName());
assertEquals("version", thirdDataTypeSeventhProperty.getKey().getLocalName());
- assertEquals("string", thirdDataTypeSeventhProperty.getType().getName());
+ assertEquals(STRING_TEXT, thirdDataTypeSeventhProperty.getType().getName());
assertTrue(thirdDataTypeSeventhProperty.isRequired());
assertEquals("Version number associated with the threshold", thirdDataTypeSeventhProperty.getDescription());
}
Iterator<Entry<PfConceptKey, JpaToscaPolicyType>> policyTypesIter = policyTypesConceptMap.entrySet().iterator();
Entry<PfConceptKey, JpaToscaPolicyType> firstPolicyType = policyTypesIter.next();
- assertEquals("onap.policies.Monitoring", firstPolicyType.getKey().getName());
- assertEquals("1.0.0", firstPolicyType.getKey().getVersion());
+ assertEquals(MONITORING, firstPolicyType.getKey().getName());
+ assertEquals(VERSION_100, firstPolicyType.getKey().getVersion());
assertEquals("tosca.policies.Root", firstPolicyType.getValue().getDerivedFrom().getName());
assertEquals("a base policy type for all policies that govern monitoring provision",
firstPolicyType.getValue().getDescription());
Entry<PfConceptKey, JpaToscaPolicyType> secondPolicyType = policyTypesIter.next();
- assertEquals("onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server",
+ assertEquals(DCAE,
secondPolicyType.getKey().getName());
- assertEquals("1.0.0", secondPolicyType.getKey().getVersion());
+ assertEquals(VERSION_100, secondPolicyType.getKey().getVersion());
assertEquals("policy.nodes.Root", secondPolicyType.getValue().getDerivedFrom().getName());
assertTrue(secondPolicyType.getValue().getProperties().size() == 2);
Iterator<JpaToscaProperty> propertiesIter = secondPolicyType.getValue().getProperties().values().iterator();
JpaToscaProperty firstProperty = propertiesIter.next();
- assertEquals("onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server",
+ assertEquals(DCAE,
firstProperty.getKey().getParentKeyName());
- assertEquals("1.0.0", firstProperty.getKey().getParentKeyVersion());
+ assertEquals(VERSION_100, firstProperty.getKey().getParentKeyVersion());
assertEquals("buscontroller_feed_publishing_endpoint", firstProperty.getKey().getLocalName());
- assertEquals("string", firstProperty.getType().getName());
+ assertEquals(STRING_TEXT, firstProperty.getType().getName());
assertEquals("DMAAP Bus Controller feed endpoint", firstProperty.getDescription());
JpaToscaProperty secondProperty = propertiesIter.next();
- assertEquals("onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server",
+ assertEquals(DCAE,
secondProperty.getKey().getParentKeyName());
- assertEquals("1.0.0", secondProperty.getKey().getParentKeyVersion());
+ assertEquals(VERSION_100, secondProperty.getKey().getParentKeyVersion());
assertEquals("datafile.policy", secondProperty.getKey().getLocalName());
- assertEquals("string", secondProperty.getType().getName());
+ assertEquals(STRING_TEXT, secondProperty.getType().getName());
assertEquals("datafile Policy JSON as string", secondProperty.getDescription());
}
Code Review / policy / models.git / commitdiff