summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java2
-rw-r--r--src/test/java/org/onap/clamp/clds/it/DcaeHttpConnectionManagerItCase.java39
-rw-r--r--src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java5
-rw-r--r--src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java26
-rw-r--r--src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java9
-rw-r--r--src/test/java/org/onap/clamp/clds/it/RefPropItCase.java5
-rw-r--r--src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java60
-rw-r--r--src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java106
-rw-r--r--src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java23
-rw-r--r--src/test/java/org/onap/clamp/clds/model/prop/CustomModelElement.java11
-rw-r--r--src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java46
-rw-r--r--src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java14
-rw-r--r--src/test/resources/application-no-camunda.properties35
-rw-r--r--src/test/resources/clds/clds-reference.properties30
-rw-r--r--src/test/resources/example/model-properties/custom/modelBpmn.json (renamed from src/test/resources/example/modelBpmnProp.json)0
-rw-r--r--src/test/resources/example/model-properties/custom/modelBpmnProperties.json248
-rw-r--r--src/test/resources/example/model-properties/holmes/modelBpmnProperties.json7
-rw-r--r--src/test/resources/example/model-properties/modelBpmn.json26
-rw-r--r--src/test/resources/example/model-properties/modelBpmnProp.json108
-rw-r--r--src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json116
-rw-r--r--src/test/resources/example/model-properties/policy/modelBpmn.json (renamed from src/test/resources/example/modelBpmnPropForPolicy.json)0
-rw-r--r--src/test/resources/example/model-properties/policy/modelBpmnProperties.json (renamed from src/test/resources/example/modelProp.json)0
-rw-r--r--src/test/resources/example/model-properties/tca/modelBpmnProperties.json11
-rw-r--r--src/test/resources/example/modelPropForPolicy.json432
-rw-r--r--src/test/resources/example/sdc/expected-result/all-sdc-services.json6
-rw-r--r--src/test/resources/example/tca-policy-req/blueprint-expected.yaml20
-rw-r--r--src/test/resources/example/tca-policy-req/blueprint-input.yaml33
-rw-r--r--src/test/resources/example/tca-policy-req/prop-text.json1
-rw-r--r--src/test/resources/https/https-test.properties35
29 files changed, 452 insertions, 1002 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java
index b4415ed1a..626cf9576 100644
--- a/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java
@@ -50,7 +50,6 @@ import org.onap.clamp.clds.util.ResourceFileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
@@ -58,7 +57,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class CldsTemplateServiceItCase extends AbstractItCase {
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsTemplateServiceItCase.class);
diff --git a/src/test/java/org/onap/clamp/clds/it/DcaeHttpConnectionManagerItCase.java b/src/test/java/org/onap/clamp/clds/it/DcaeHttpConnectionManagerItCase.java
index 56de81d46..2bdef978a 100644
--- a/src/test/java/org/onap/clamp/clds/it/DcaeHttpConnectionManagerItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/DcaeHttpConnectionManagerItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,30 +59,35 @@ import org.springframework.test.context.junit4.SpringRunner;
@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
@TestPropertySource(locations = "classpath:https/https-test.properties")
public class DcaeHttpConnectionManagerItCase extends AbstractItCase {
+
@Value("${server.port}")
private String httpsPort;
@Value("${server.http-to-https-redirection.port}")
private String httpPort;
- private static TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
- @Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return null;
- }
+ private static TrustManager[] trustAllCerts = new TrustManager[] {
+ new X509TrustManager() {
+
+ @Override
+ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
- @Override
- public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- }
+ @Override
+ public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ }
- @Override
- public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
- }
- } };
+ @Override
+ public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+ }
+ }
+ };
private void enableSslNoCheck() throws NoSuchAlgorithmException, KeyManagementException {
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
HostnameVerifier allHostsValid = new HostnameVerifier() {
+
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
@@ -119,20 +124,20 @@ public class DcaeHttpConnectionManagerItCase extends AbstractItCase {
public void testHttpsGet404() throws IOException {
DcaeHttpConnectionManager.doDcaeHttpQuery("https://localhost:" + this.httpsPort + "/designer/index1.html",
"GET", null, null);
- fail("Should have raised an BadRequestException exception");
+ fail("Should have raised an BadRequestException");
}
@Test(expected = BadRequestException.class)
public void testHttpsPost404() throws IOException {
DcaeHttpConnectionManager.doDcaeHttpQuery("https://localhost:" + this.httpsPort + "/designer/index1.html",
"POST", "", "application/json");
- fail("Should have raised an BadRequestException exception");
+ fail("Should have raised an BadRequestException");
}
- @Test(expected = IOException.class)
+ @Test(expected = BadRequestException.class)
public void testHttpException() throws IOException {
DcaeHttpConnectionManager.doDcaeHttpQuery("http://localhost:" + this.httpsPort + "/designer/index.html", "GET",
null, null);
- fail("Should have raised an IOException exception");
+ fail("Should have raised an BadRequestException");
}
}
diff --git a/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java b/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java
index 62e04ede3..6f5c24d5e 100644
--- a/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/HolmesPolicyDelegateItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,6 @@ import org.onap.clamp.clds.model.prop.Holmes;
import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.util.ResourceFileUtil;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -43,8 +42,8 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class HolmesPolicyDelegateItCase extends AbstractItCase {
+
@Test
public void testCreatePolicyJson() throws IOException {
String modelBpmnProp = ResourceFileUtil
diff --git a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
index 300919957..9013e0c41 100644
--- a/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/OperationPolicyReqItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,25 +45,24 @@ import org.onap.clamp.clds.util.ResourceFileUtil;
import org.onap.policy.api.AttributeType;
import org.onap.policy.controlloop.policy.builder.BuilderException;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class OperationPolicyReqItCase extends AbstractItCase {
+
@Test
public void formatAttributesTest() throws IOException, BuilderException {
- String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
- String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
- ModelProperties prop = new ModelProperties("testModel", "controlNameTest", CldsEvent.ACTION_SUBMIT, true,
- modelBpmnProp, modelProp);
+ String modelBpmnProp = ResourceFileUtil
+ .getResourceAsString("example/model-properties/policy/modelBpmnProperties.json");
+ String modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/policy/modelBpmn.json");
+ ModelProperties modelProperties = new ModelProperties("testModel", "controlNameTest", CldsEvent.ACTION_SUBMIT,
+ true, modelBpmn, modelBpmnProp);
List<Map<AttributeType, Map<String, String>>> attributes = new ArrayList<>();
- if (prop.getType(Policy.class).isFound()) {
- for (PolicyChain policyChain : prop.getType(Policy.class).getPolicyChains()) {
-
- attributes.add(OperationalPolicyReq.formatAttributes(refProp, prop, prop.getType(Policy.class).getId(),
- policyChain));
+ if (modelProperties.getType(Policy.class).isFound()) {
+ for (PolicyChain policyChain : modelProperties.getType(Policy.class).getPolicyChains()) {
+ attributes.add(OperationalPolicyReq.formatAttributes(refProp, modelProperties,
+ modelProperties.getType(Policy.class).getId(), policyChain));
}
}
assertFalse(attributes.isEmpty());
@@ -77,9 +76,7 @@ public class OperationPolicyReqItCase extends AbstractItCase {
// Remove this field as not always present (depends of policy api)
yaml = yaml.replaceAll(" pnf: null" + System.lineSeparator(), "");
yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
-
assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-1.yaml"), yaml);
-
yaml = URLDecoder.decode(attributes.get(1).get(AttributeType.RULE).get("ControlLoopYaml"), "UTF-8");
yaml = yaml.replaceAll("trigger_policy: (.*)", "trigger_policy: <generatedId>");
yaml = yaml.replaceAll("id: (.*)", "id: <generatedId>");
@@ -87,7 +84,6 @@ public class OperationPolicyReqItCase extends AbstractItCase {
// Remove this field as not always present (depends of policy api)
yaml = yaml.replaceAll(" pnf: null" + System.lineSeparator(), "");
yaml = yaml.substring(yaml.indexOf("controlLoop:"), yaml.length());
-
assertEquals(ResourceFileUtil.getResourceAsString("example/operational-policy/yaml-policy-chain-2.yaml"), yaml);
}
}
diff --git a/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
index 275737761..71bd2d521 100644
--- a/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/PolicyClientItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,6 @@ import org.onap.clamp.clds.model.prop.Tca;
import org.onap.clamp.clds.util.ResourceFileUtil;
import org.onap.policy.api.AttributeType;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -53,8 +52,8 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class PolicyClientItCase extends AbstractItCase {
+
String modelProp;
String modelBpmnProp;
String modelName;
@@ -65,8 +64,8 @@ public class PolicyClientItCase extends AbstractItCase {
*/
@Before
public void setUp() throws IOException {
- modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
- modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
+ modelProp = ResourceFileUtil.getResourceAsString("example/model-properties/policy/modelBpmnProperties.json");
+ modelBpmnProp = ResourceFileUtil.getResourceAsString("example/model-properties/policy/modelBpmn.json");
modelName = "example-model06";
controlName = "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf";
}
diff --git a/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java b/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java
index 7ccda5a85..8f76b1822 100644
--- a/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/RefPropItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +34,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.clamp.clds.AbstractItCase;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -42,8 +41,8 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class RefPropItCase extends AbstractItCase {
+
protected static final EELFLogger logger = EELFManager.getInstance().getLogger(RefPropItCase.class);
/**
diff --git a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
index f2eadbe4b..548212ef8 100644
--- a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,6 @@ import org.onap.clamp.clds.model.CldsSdcServiceInfo;
import org.onap.clamp.clds.model.CldsServiceData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -49,46 +48,38 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class SdcCatalogServicesItCase extends AbstractItCase {
+
@Autowired
private SdcCatalogServices sdcCatalogWired = new SdcCatalogServices();
@Test
public void removeDuplicateServicesTest() {
-
CldsSdcServiceInfo service1a = new CldsSdcServiceInfo();
service1a.setName("service1");
service1a.setVersion("1.0");
service1a.setInvariantUUID("invariantUUID1.0");
-
List<CldsSdcServiceInfo> rawCldsSdcServiceList = new LinkedList<>();
rawCldsSdcServiceList.add(service1a);
rawCldsSdcServiceList.add(service1a);
-
CldsSdcServiceInfo service1b = new CldsSdcServiceInfo();
service1b.setName("service1");
service1b.setVersion("1.1");
service1b.setInvariantUUID("invariantUUID1.1");
rawCldsSdcServiceList.add(service1b);
-
CldsSdcServiceInfo service1c = new CldsSdcServiceInfo();
service1c.setName("service1");
service1c.setVersion("1.2");
service1c.setInvariantUUID("invariantUUID1.2");
rawCldsSdcServiceList.add(service1c);
-
CldsSdcServiceInfo service2 = new CldsSdcServiceInfo();
service2.setName("service2");
service2.setVersion("1.0");
service2.setInvariantUUID("invariantUUID2.0");
rawCldsSdcServiceList.add(service2);
-
SdcCatalogServices catalogServices = new SdcCatalogServices();
List<CldsSdcServiceInfo> resultList = catalogServices.removeDuplicateServices(rawCldsSdcServiceList);
-
assertTrue(resultList.size() == 2);
-
CldsSdcServiceInfo res1;
CldsSdcServiceInfo res2;
if ("service1".equals(resultList.get(0).getName())) {
@@ -98,43 +89,33 @@ public class SdcCatalogServicesItCase extends AbstractItCase {
res1 = resultList.get(1);
res2 = resultList.get(0);
}
-
assertTrue("service1".equals(res1.getName()));
assertTrue("1.2".equals(res1.getVersion()));
-
assertTrue("service2".equals(res2.getName()));
assertTrue("1.0".equals(res2.getVersion()));
-
}
@Test
public void removeDuplicateSdcResourceInstancesTest() {
-
List<CldsSdcResource> rawCldsSdcResourceList = new LinkedList<>();
-
CldsSdcResource sdcResource1a = new CldsSdcResource();
sdcResource1a.setResourceInstanceName("resource1");
sdcResource1a.setResourceVersion("1.0");
rawCldsSdcResourceList.add(sdcResource1a);
-
CldsSdcResource sdcResource1b = new CldsSdcResource();
sdcResource1b.setResourceInstanceName("resource1");
sdcResource1b.setResourceVersion("1.1");
rawCldsSdcResourceList.add(sdcResource1b);
-
CldsSdcResource sdcResource1c = new CldsSdcResource();
sdcResource1c.setResourceInstanceName("resource1");
sdcResource1c.setResourceVersion("1.2");
rawCldsSdcResourceList.add(sdcResource1c);
-
CldsSdcResource sdcResource2 = new CldsSdcResource();
sdcResource2.setResourceInstanceName("resource2");
sdcResource2.setResourceVersion("1.0");
rawCldsSdcResourceList.add(sdcResource2);
-
SdcCatalogServices catalogServices = new SdcCatalogServices();
List<CldsSdcResource> resultList = catalogServices.removeDuplicateSdcResourceInstances(rawCldsSdcResourceList);
-
CldsSdcResource res1;
CldsSdcResource res2;
if ("resource1".equals(resultList.get(0).getResourceInstanceName())) {
@@ -144,44 +125,34 @@ public class SdcCatalogServicesItCase extends AbstractItCase {
res1 = resultList.get(1);
res2 = resultList.get(0);
}
-
assertTrue("resource1".equals(res1.getResourceInstanceName()));
assertTrue("1.2".equals(res1.getResourceVersion()));
-
assertTrue("resource2".equals(res2.getResourceInstanceName()));
assertTrue("1.0".equals(res2.getResourceVersion()));
-
}
@Test
public void removeDuplicateSdcResourceBasicInfoTest() {
-
List<CldsSdcResourceBasicInfo> rawCldsSdcResourceList = new LinkedList<>();
-
CldsSdcResourceBasicInfo sdcResource1a = new CldsSdcResourceBasicInfo();
sdcResource1a.setName("resource1");
sdcResource1a.setVersion("1.0");
rawCldsSdcResourceList.add(sdcResource1a);
-
CldsSdcResourceBasicInfo sdcResource1b = new CldsSdcResourceBasicInfo();
sdcResource1b.setName("resource1");
sdcResource1b.setVersion("1.1");
rawCldsSdcResourceList.add(sdcResource1b);
-
CldsSdcResourceBasicInfo sdcResource1c = new CldsSdcResourceBasicInfo();
sdcResource1c.setName("resource1");
sdcResource1c.setVersion("1.2");
rawCldsSdcResourceList.add(sdcResource1c);
-
CldsSdcResourceBasicInfo sdcResource2 = new CldsSdcResourceBasicInfo();
sdcResource2.setName("resource2");
sdcResource2.setVersion("1.0");
rawCldsSdcResourceList.add(sdcResource2);
-
SdcCatalogServices catalogServices = new SdcCatalogServices();
List<CldsSdcResourceBasicInfo> resultList = catalogServices
.removeDuplicateSdcResourceBasicInfo(rawCldsSdcResourceList);
-
CldsSdcResourceBasicInfo res1;
CldsSdcResourceBasicInfo res2;
if ("resource1".equals(resultList.get(0).getName())) {
@@ -191,19 +162,15 @@ public class SdcCatalogServicesItCase extends AbstractItCase {
res1 = resultList.get(1);
res2 = resultList.get(0);
}
-
assertTrue("resource1".equals(res1.getName()));
assertTrue("1.2".equals(res1.getVersion()));
-
assertTrue("resource2".equals(res2.getName()));
assertTrue("1.0".equals(res2.getVersion()));
-
}
@Test
public void getServiceUuidFromServiceInvariantIdTest() throws Exception {
SdcCatalogServices spy = Mockito.spy(sdcCatalogWired);
-
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"),
"UTF-8")).when(spy).getSdcServicesInformation(null);
@@ -211,120 +178,97 @@ public class SdcCatalogServicesItCase extends AbstractItCase {
// should not exist, returning empty string
String resUuidVcts4Null = spy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d9b");
assertTrue("".equals(resUuidVcts4Null));
-
// Try the vcts4 version 1.1, this one should be there as it replaces
// the vcts4 v1.0
String resUuidVcts4Latest = spy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d9c");
assertTrue("29018914-966c-442d-9d08-251b9dc45b8f".equals(resUuidVcts4Latest));
-
// Try the vcts5 version 1.0, this one should be there
String resUuidVcts5 = spy.getServiceUuidFromServiceInvariantId("a33ed748-3477-4434-b3f3-b5560f5e7d8c");
assertTrue("29018914-966c-442d-9d08-251b9dc45b7f".equals(resUuidVcts5));
-
// try one that does not exist at all
String resUuidUnknown = spy.getServiceUuidFromServiceInvariantId("testuuid");
assertTrue("".equals(resUuidUnknown));
-
}
@Test
public void getCldsServiceDataWithAlarmConditionsTest() throws Exception {
SdcCatalogServices spy = Mockito.spy(sdcCatalogWired);
-
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServicesListExample.json"),
"UTF-8")).when(spy).getSdcServicesInformation(null);
-
// This invariant uuid is the one from vcts4 v1.1
String serviceResourceDetailUrl = refProp.getStringValue("sdc.serviceUrl")
+ "/29018914-966c-442d-9d08-251b9dc45b8f/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcServiceDetailsExample.json"),
"UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(serviceResourceDetailUrl);
-
String resourceDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/585822c7-4027-4f84-ba50-e9248606f136/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcResourceDetailsExample.json"),
"UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(resourceDetailUrl);
-
String securityRulesDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/d57e57d2-e3c6-470d-8d16-e6ea05f536c5/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcSecurityRules.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(securityRulesDetailUrl);
-
String cinderVolumeDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/b4288e07-597a-44a2-aa98-ad36e551a39d/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCinderVolume.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(cinderVolumeDetailUrl);
-
String vfcGenericDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/2c8f1219-8000-4001-aa13-496a0396d40f/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCGenericWithAlarms.json"),
"UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(vfcGenericDetailUrl);
-
String csvAlarmsDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/2c8f1219-8000-4001-aa13-496a0396d40f/resourceInstances/virc_fe_be/artifacts/5138e316-0237-49aa-817a-b3d8eaf77392";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl);
-
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl);
-
String csvAlarmsDetailUrl2 = refProp.getStringValue("sdc.catalog.url")
+ "resources/d7646638-2572-4a94-b497-c028ac15f9ca/artifacts/5138e316-0237-49aa-817a-b3d8eaf77392";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcAlarmsList.csv"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(csvAlarmsDetailUrl2);
-
String allVfResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VF";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFResources.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(allVfResourcesDetailUrl);
-
String vfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url")
+ "resources/a0475018-1e7e-4ddd-8bee-33cbf958c2e6/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCVFCResourceExample.json"),
"UTF-8")).when(spy).getCldsServicesOrResourcesBasedOnURL(vfcResourcesDetailUrl);
-
String allVfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=VFC";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCResources.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(allVfcResourcesDetailUrl);
-
String allCvfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=CVFC";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCVFCResources.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(allCvfcResourcesDetailUrl);
-
String allVfAlarms = refProp.getStringValue("sdc.catalog.url")
+ "resources/84855843-5247-4e97-a2bd-5395a510253b/artifacts/d57ac7ec-f3c3-4793-983a-c75ac3a43153";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcMeasurementsList.csv"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(allVfAlarms);
-
String vfcResourceExample = refProp.getStringValue("sdc.catalog.url")
+ "resources/d7646638-2572-4a94-b497-c028ac15f9ca/metadata";
Mockito.doReturn(IOUtils.toString(
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCResourceExample.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(vfcResourceExample);
-
CldsServiceData cldsServiceData = spy
.getCldsServiceDataWithAlarmConditions("a33ed748-3477-4434-b3f3-b5560f5e7d9c");
assertTrue("a33ed748-3477-4434-b3f3-b5560f5e7d9c".equals(cldsServiceData.getServiceInvariantUUID()));
assertTrue("29018914-966c-442d-9d08-251b9dc45b8f".equals(cldsServiceData.getServiceUUID()));
assertTrue(cldsServiceData.getCldsVfs().size() == 1);
-
List<CldsAlarmCondition> alarmsList = spy.getAllAlarmConditionsFromCldsServiceData(cldsServiceData,
"alarmCondition");
assertTrue(alarmsList.size() == 12);
-
}
-
}
diff --git a/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java b/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java
index 757d85b53..afff9dd7d 100644
--- a/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,67 +23,85 @@
package org.onap.clamp.clds.it;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.IOException;
import java.security.GeneralSecurityException;
-import java.util.ArrayList;
import java.util.List;
import org.apache.commons.codec.DecoderException;
-import org.camunda.bpm.engine.delegate.DelegateExecution;
-import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.clamp.clds.client.req.sdc.SdcCatalogServices;
+import org.onap.clamp.clds.AbstractItCase;
import org.onap.clamp.clds.client.req.sdc.SdcReq;
-import org.onap.clamp.clds.model.CldsSdcResource;
-import org.onap.clamp.clds.model.CldsSdcServiceDetail;
-import org.onap.clamp.clds.model.prop.Global;
+import org.onap.clamp.clds.model.CldsEvent;
import org.onap.clamp.clds.model.prop.ModelProperties;
+import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.skyscreamer.jsonassert.JSONAssert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
-public class SdcReqItCase {
- String baseUrl = "AYBABTU";
- String serviceInvariantUuid = "serviceInvariantUUID";
+public class SdcReqItCase extends AbstractItCase {
+
@Autowired
private SdcReq sdcReq;
+ private String modelBpmnProp;
+ private String modelBpmn;
+ private String modelName;
+ private String controlName;
+ private ModelProperties modelProperties;
+ private String jsonWithYamlInside;
+
+ /**
+ * Initialize Test.
+ */
+ @Before
+ public void setUp() throws IOException {
+ modelBpmnProp = ResourceFileUtil.getResourceAsString("example/model-properties/tca/modelBpmnProperties.json");
+ modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/tca/modelBpmn.json");
+ modelName = "example-model01";
+ controlName = "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf";
+ modelProperties = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, false, modelBpmn,
+ modelBpmnProp);
+ jsonWithYamlInside = ResourceFileUtil.getResourceAsString("example/tca-policy-req/prop-text.json");
+ }
+
+ @Test
+ public void formatBlueprintTest() throws IOException {
+ String blueprintFormatted = sdcReq.formatBlueprint(modelProperties, jsonWithYamlInside);
+ assertEquals(ResourceFileUtil.getResourceAsString("example/tca-policy-req/blueprint-expected.yaml"),
+ blueprintFormatted);
+ }
+
+ @Test
+ public void formatSdcLocationsReqTest() {
+ String blueprintFormatted = sdcReq.formatSdcLocationsReq(modelProperties, "testos");
+ assertEquals(
+ "{\"artifactName\":\"testos\",\"locations\":[\"SNDGCA64\",\"ALPRGAED\",\"LSLEILAA\",\"MDTWNJC1\"]}",
+ blueprintFormatted);
+ }
+
+ @Test
+ public void formatSdcReqTest() {
+ String jsonResult = sdcReq.formatSdcReq("payload", "artifactName", "artifactLabel", "artifactType");
+ JSONAssert.assertEquals(
+ "{\"payloadData\" : \"cGF5bG9hZA==\",\"artifactLabel\" : \"artifactLabel\",\"artifactName\" :\"artifactName\",\"artifactType\" : \"artifactType\","
+ + "\"artifactGroupType\" : \"DEPLOYMENT\",\"description\" : \"from CLAMP Cockpit\"}",
+ jsonResult, true);
+ }
@Test
- public void getSdcReqUrlsListNoGlobalPropTest() throws GeneralSecurityException, DecoderException {
- ModelProperties prop = mock(ModelProperties.class);
- SdcCatalogServices sdcCatalogServices = mock(SdcCatalogServices.class);
- DelegateExecution delegateExecution = mock(DelegateExecution.class);
- CldsSdcResource cldsSdcResource = mock(CldsSdcResource.class);
- List<CldsSdcResource> cldsSdcResources = new ArrayList<>();
- cldsSdcResources.add(cldsSdcResource);
- List<String> resourceVf = new ArrayList<>();
- resourceVf.add(serviceInvariantUuid);
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- Global global = mock(Global.class);
- when(prop.getGlobal()).thenReturn(global);
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- when(global.getService()).thenReturn(serviceInvariantUuid);
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- CldsSdcServiceDetail cldsSdcServiceDetail = mock(CldsSdcServiceDetail.class);
- when(sdcCatalogServices.getCldsSdcServiceDetailFromJson(null)).thenReturn(cldsSdcServiceDetail);
- when(global.getResourceVf()).thenReturn(new ArrayList<>());
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- when(cldsSdcServiceDetail.getResources()).thenReturn(cldsSdcResources);
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- when(cldsSdcResource.getResoucreType()).thenReturn("VF");
- Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
- when(global.getResourceVf()).thenReturn(resourceVf);
- when(cldsSdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUuid);
- when(cldsSdcResource.getResourceInstanceName()).thenReturn("Resource instance name");
- List<String> expected = new ArrayList<>();
- expected.add("AYBABTU/null/resourceInstances/resourceinstancename/artifacts");
- Assert.assertEquals(expected, sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution));
+ public void getSdcReqUrlsListTest() throws GeneralSecurityException, DecoderException {
+ List<String> listUrls = sdcReq.getSdcReqUrlsList(modelProperties, refProp.getStringValue("sdc.serviceUrl"));
+ assertNotNull(listUrls);
+ assertTrue(listUrls.size() == 1);
+ assertTrue(listUrls.get(0).contains(
+ "/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts"));
}
}
diff --git a/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java b/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java
index c17ec0df8..419bfde22 100644
--- a/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/TcaRequestFormatterItCase.java
@@ -39,7 +39,6 @@ import org.onap.clamp.clds.model.prop.ModelProperties;
import org.onap.clamp.clds.util.ResourceFileUtil;
import org.skyscreamer.jsonassert.JSONAssert;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
/**
@@ -47,14 +46,14 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@SpringBootTest
-@TestPropertySource(locations = "classpath:application-no-camunda.properties")
public class TcaRequestFormatterItCase extends AbstractItCase {
- String modelProp;
- String modelBpmn;
- String modelName;
- String controlName;
- String yamlInput;
+ private String modelProp;
+ private String modelBpmn;
+ private String modelName;
+ private String controlName;
+ private String yamlInput;
+ private ModelProperties modelProperties;
/**
* Initialize Test.
@@ -66,13 +65,13 @@ public class TcaRequestFormatterItCase extends AbstractItCase {
yamlInput = ResourceFileUtil.getResourceAsString("example/tca-policy-req/blueprint-input.yaml");
modelName = "example-model01";
controlName = "ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf";
+ modelProperties = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, false, modelBpmn,
+ modelProp);
}
@Test
public void testCreatePolicyJson() throws IOException, JSONException {
- ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, false, modelBpmn,
- modelProp);
- String result = TcaRequestFormatter.createPolicyJson(refProp, prop);
+ String result = TcaRequestFormatter.createPolicyJson(refProp, modelProperties);
assertNotNull(result);
JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("example/tca-policy-req/tca-policy-expected.json"),
result, true);
@@ -80,9 +79,7 @@ public class TcaRequestFormatterItCase extends AbstractItCase {
@Test
public void testUpdatedBlueprintWithConfiguration() throws IOException {
- ModelProperties prop = new ModelProperties(modelName, controlName, CldsEvent.ACTION_SUBMIT, false, modelBpmn,
- modelProp);
- String result = TcaRequestFormatter.updatedBlueprintWithConfiguration(refProp, prop, yamlInput);
+ String result = TcaRequestFormatter.updatedBlueprintWithConfiguration(refProp, modelProperties, yamlInput);
assertNotNull(result);
assertEquals(ResourceFileUtil.getResourceAsString("example/tca-policy-req/blueprint-expected.yaml"), result);
}
diff --git a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElement.java b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElement.java
index 03d7d65da..138d727c0 100644
--- a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElement.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElement.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.databind.JsonNode;
*/
public class CustomModelElement extends AbstractModelElement {
+ private String test;
private static final String CUSTOM_TYPE = "customType";
/**
@@ -38,10 +39,18 @@ public class CustomModelElement extends AbstractModelElement {
public CustomModelElement(ModelProperties modelProp, ModelBpmn modelBpmn, JsonNode modelJson) {
super(CUSTOM_TYPE, modelProp, modelBpmn, modelJson);
topicPublishes = getValueByName("topicPublishes");
+ test = this.getValueByName("test");
}
public static final String getType() {
return CUSTOM_TYPE;
}
+ public String getTest() {
+ return test;
+ }
+
+ public void setTest(String test) {
+ this.test = test;
+ }
}
diff --git a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
index 89eaf51cd..46c70e55e 100644
--- a/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/CustomModelElementTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,33 +35,21 @@ public class CustomModelElementTest {
}
@Test
- public void testNewElement() {
-
- try {
- String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/modelBpmnProp.json");
- String modelProp = ResourceFileUtil.getResourceAsString("example/modelProp.json");
- String modName = "example-model-name";
- String controlName = "example-control-name";
-
- CustomModelElement customModelElement = null;
-
- // Instantiate first, we should not have our CustomModelElement yet
- ModelProperties prop = new ModelProperties(modName, controlName, null, true, modelBpmnProp, modelProp);
-
- Assert.assertNotNull(prop);
-
- customModelElement = prop.getType(CustomModelElement.class);
-
- Assert.assertNull(customModelElement);
-
- ModelProperties.registerModelElement(CustomModelElement.class, CustomModelElement.getType());
-
- customModelElement = prop.getType(CustomModelElement.class);
-
- Assert.assertNotNull(customModelElement);
-
- } catch (IOException e) {
- e.printStackTrace();
- }
+ public void testCustomElement() throws IOException {
+ String modelBpmnProp = ResourceFileUtil.getResourceAsString("example/model-properties/custom/modelBpmn.json");
+ String modelProp = ResourceFileUtil
+ .getResourceAsString("example/model-properties/custom/modelBpmnProperties.json");
+ String modName = "example-model-name";
+ String controlName = "example-control-name";
+ CustomModelElement customModelElement = null;
+ // Instantiate first, we should not have our CustomModelElement yet
+ ModelProperties prop = new ModelProperties(modName, controlName, null, true, modelBpmnProp, modelProp);
+ Assert.assertNotNull(prop);
+ customModelElement = prop.getType(CustomModelElement.class);
+ Assert.assertNull(customModelElement);
+ ModelProperties.registerModelElement(CustomModelElement.class, CustomModelElement.getType());
+ customModelElement = prop.getType(CustomModelElement.class);
+ Assert.assertNotNull(customModelElement);
+ Assert.assertEquals("This is a test", customModelElement.getTest());
}
}
diff --git a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
index eb0214127..7bb11a9ef 100644
--- a/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
+++ b/src/test/java/org/onap/clamp/clds/model/prop/ModelPropertiesTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,14 +46,11 @@ public class ModelPropertiesTest {
@Test
public void testTcaModelDecoding() throws IOException {
-
String modelBpmnProp = ResourceFileUtil
.getResourceAsString("example/model-properties/tca/modelBpmnProperties.json");
String modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/tca/modelBpmn.json");
-
ModelProperties prop = new ModelProperties("example-model-name", "example-control-name", null, true, modelBpmn,
modelBpmnProp);
-
Policy policy = prop.getType(Policy.class);
assertTrue(policy.isFound());
assertEquals(1, policy.getPolicyChains().size());
@@ -64,7 +61,6 @@ public class ModelPropertiesTest {
assertEquals(3, policy.getPolicyChains().get(0).getPolicyItems().get(0).getMaxRetries());
assertEquals("", policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicy());
assertEquals(null, policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicyConditions());
-
Tca tca = prop.getType(Tca.class);
assertNotNull(tca);
assertTrue(tca.isFound());
@@ -73,14 +69,12 @@ public class ModelPropertiesTest {
assertEquals("policy1", tca.getTcaItem().getPolicyId());
assertEquals("f734f031-10aa-t8fb-330f-04dde2886325", tca.getTcaItem().getTcaUuId());
assertEquals(2, tca.getTcaItem().getTcaThresholds().size());
-
assertEquals("ABATED", tca.getTcaItem().getTcaThresholds().get(0).getClosedLoopEventStatus());
assertEquals(
"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
tca.getTcaItem().getTcaThresholds().get(0).getFieldPath());
assertEquals("LESS_OR_EQUAL", tca.getTcaItem().getTcaThresholds().get(0).getOperator());
assertEquals(Integer.valueOf(123), tca.getTcaItem().getTcaThresholds().get(0).getThreshold());
-
assertEquals("ONSET", tca.getTcaItem().getTcaThresholds().get(1).getClosedLoopEventStatus());
assertEquals("$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
tca.getTcaItem().getTcaThresholds().get(1).getFieldPath());
@@ -90,14 +84,11 @@ public class ModelPropertiesTest {
@Test
public void testHolmesModelDecoding() throws IOException {
-
String modelBpmnProp = ResourceFileUtil
.getResourceAsString("example/model-properties/holmes/modelBpmnProperties.json");
String modelBpmn = ResourceFileUtil.getResourceAsString("example/model-properties/holmes/modelBpmn.json");
-
ModelProperties prop = new ModelProperties("example-model-name", "example-control-name", null, true, modelBpmn,
modelBpmnProp);
-
Policy policy = prop.getType(Policy.class);
assertTrue(policy.isFound());
assertEquals(1, policy.getPolicyChains().size());
@@ -108,7 +99,6 @@ public class ModelPropertiesTest {
assertEquals(3, policy.getPolicyChains().get(0).getPolicyItems().get(0).getMaxRetries());
assertEquals("", policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicy());
assertEquals(null, policy.getPolicyChains().get(0).getPolicyItems().get(0).getParentPolicyConditions());
-
Holmes holmes = prop.getType(Holmes.class);
assertNotNull(holmes);
assertTrue(holmes.isFound());
@@ -121,6 +111,6 @@ public class ModelPropertiesTest {
CldsModel cldsModel = new CldsModel();
cldsModel.setPropText(
ResourceFileUtil.getResourceAsString("example/model-properties/tca/modelBpmnProperties.json"));
- assertEquals("f5213e3a-9191-4362-93b5-b67f8d770e44", ModelProperties.getVf(cldsModel));
+ assertEquals("023a3f0d-1161-45ff-b4cf-8918a8ccf3ad", ModelProperties.getVf(cldsModel));
}
} \ No newline at end of file
diff --git a/src/test/resources/application-no-camunda.properties b/src/test/resources/application-no-camunda.properties
index f7b2badef..2e284b032 100644
--- a/src/test/resources/application-no-camunda.properties
+++ b/src/test/resources/application-no-camunda.properties
@@ -76,42 +76,15 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
camel.springboot.consumer-template-cache-size=1000
camel.springboot.producer-template-cache-size=1000
-camel.springboot.jmx-enabled=true
+camel.springboot.jmx-enabled=false
camel.defaultthreadpool.poolsize=10
camel.defaultthreadpool.maxpoolsize=20
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-
-#server.port=0
-
-#Camunda Process Engine DataSource connection Details
-spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.camunda.username=camunda
-spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e
-spring.datasource.camunda.validationQuery=SELECT 1
-spring.datasource.camunda.validationQueryTimeout=20000
-spring.datasource.camunda.validationInterval=30000
-spring.datasource.camunda.testWhileIdle = true
-spring.datasource.camunda.minIdle = 0
-spring.datasource.camunda.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.camunda.testOnBorrow=true
-spring.datasource.camunda.ignoreExceptionOnPreLoad=true
-
-#Camunda application properties
-#Camunda history level
-camunda.bpm.history-level=none
-camunda.bpm.enabled=false
-camunda.bpm.jpa.enabled=false
-camunda.bpm.auto-deployment-enabled=false
-camunda.bpm.job-execution.active=false
-camunda.bpm.job-execution.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.metrics.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.database.schema-update=true
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml
+#camel.springboot.typeConversion = false
#clds datasource connection details
spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver
diff --git a/src/test/resources/clds/clds-reference.properties b/src/test/resources/clds/clds-reference.properties
index 4627269a5..d6c8bc45b 100644
--- a/src/test/resources/clds/clds-reference.properties
+++ b/src/test/resources/clds/clds-reference.properties
@@ -2,19 +2,19 @@
# ============LICENSE_START=======================================================
# ONAP CLAMP
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2018 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.
+# 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
+#
+# 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============================================
# ===================================================================
@@ -77,11 +77,11 @@ op.eNodeB.limit=2
op.eNodeB.period=10s
#
# Sdc service properties
-sdc.catalog.url=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/
-sdc.hostUrl=http://sdc.api.simpledemo.onap.org:8080
-sdc.serviceUrl=http://sdc.api.simpledemo.onap.org:8080/sdc/v1/catalog/services
-sdc.serviceUsername=test
-sdc.servicePassword=aa2871669d793c7fb7abbcda31b88b4c29bf2982755b25f08f8d0130539c11b0
+sdc.catalog.url=http://localhost:${docker.http-cache.port.host}/sdc/v1/catalog/
+sdc.hostUrl=http://localhost:${docker.http-cache.port.host}
+sdc.serviceUrl=http://localhost:${docker.http-cache.port.host}/sdc/v1/catalog/services
+sdc.serviceUsername=clamp
+sdc.servicePassword=b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981
sdc.artifactLabel=blueprintclampcockpit
sdc.sdcX-InstanceID=CLAMP
sdc.artifactType=DCAE_INVENTORY_BLUEPRINT
@@ -98,7 +98,7 @@ ui.alarm.default={"Reports a transient alarm condition when an incoming CDR cann
action.test.override=false
# if action.insert.test.event is true, then insert event even if the action is set to test
action.insert.test.event=false
-CLDS_SERVICE_CACHE_MAX_SECONDS=30
+clds.service.cache.invalidate.after.seconds=120
#DCAE Inventory Url Properties
DCAE_INVENTORY_URL = http://dcae.api.simpledemo.onap.org:8080
diff --git a/src/test/resources/example/modelBpmnProp.json b/src/test/resources/example/model-properties/custom/modelBpmn.json
index c8efff877..c8efff877 100644
--- a/src/test/resources/example/modelBpmnProp.json
+++ b/src/test/resources/example/model-properties/custom/modelBpmn.json
diff --git a/src/test/resources/example/model-properties/custom/modelBpmnProperties.json b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
new file mode 100644
index 000000000..fc2f1fd99
--- /dev/null
+++ b/src/test/resources/example/model-properties/custom/modelBpmnProperties.json
@@ -0,0 +1,248 @@
+{
+ "global":
+ [
+ {
+ "name": "service",
+ "value":
+ [
+ "0f983e18-4603-4bb4-a98c-e29691fb16a1"
+ ]
+ },
+
+ {
+ "name": "vf",
+ "value":
+ [
+ "6c7aaec2-59eb-41d9-8681-b7f976ab668d"
+ ]
+ },
+
+ {
+ "name": "actionSet",
+ "value":
+ [
+ "enbRecipe"
+ ]
+ },
+
+ {
+ "name": "location",
+ "value":
+ [
+ "SNDGCA64"
+ ]
+ }
+ ],
+
+ "Policy_":
+ {
+ "Policy1":
+ [
+ {
+ "name": "pname",
+ "value": "Policy1"
+ },
+
+ {
+ "name": "pid",
+ "value": "1"
+ },
+
+ {
+ "name": "timeout",
+ "value": "500"
+ },
+
+ {
+ "policyConfigurations":
+ [
+ [
+ {
+ "name": "recipe",
+ "value":
+ [
+ "restart"
+ ]
+ },
+
+ {
+ "name": "maxRetries",
+ "value":
+ [
+ "3"
+ ]
+ },
+
+ {
+ "name": "retryTimeLimit",
+ "value":
+ [
+ "180"
+ ]
+ },
+
+ {
+ "name": "_id",
+ "value":
+ [
+ "n9bQ4t6"
+ ]
+ },
+
+ {
+ "name": "parentPolicy",
+ "value":
+ [
+ ""
+ ]
+ },
+ {
+ "name": "targetResourceId",
+ "value":
+ [
+ "resource-id"
+ ]
+ }
+ ],
+
+ [
+ {
+ "name": "recipe",
+ "value":
+ [
+ "rebuild"
+ ]
+ },
+
+ {
+ "name": "maxRetries",
+ "value":
+ [
+ "3"
+ ]
+ },
+
+ {
+ "name": "retryTimeLimit",
+ "value":
+ [
+ "180"
+ ]
+ },
+
+ {
+ "name": "_id",
+ "value":
+ [
+ "ItE5xKT"
+ ]
+ },
+
+ {
+ "name": "parentPolicy",
+ "value":
+ [
+ "n9bQ4t6"
+ ]
+ },
+
+ {
+ "name": "parentPolicyConditions",
+ "value":
+ [
+ "Failure_Retries",
+ "Failure_Timeout",
+ "Failure_Exception",
+ "Failure"
+ ]
+ },
+ {
+ "name": "targetResourceId",
+ "value":
+ [
+ "resource-id"
+ ]
+ }
+ ]
+ ]
+ }
+ ]
+ },
+
+ "TCA_":
+ {
+ "Narra":
+ [
+ {
+ "name": "tname",
+ "value": "Narra"
+ },
+
+ {
+ "name": "tuuid",
+ "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
+ },
+
+ {
+ "name": "tnfc",
+ "value": "ENBE"
+ },
+
+ {
+ "name": "tcaEnab",
+ "value": "on"
+ },
+
+ {
+ "name": "tcaPol",
+ "value": "Policy1"
+ },
+
+ {
+ "name": "tcaPolId",
+ "value": "1"
+ },
+
+ {
+ "name": "tcaInt",
+ "value": "2"
+ },
+
+ {
+ "name": "tcaSev",
+ "value": "Warning"
+ },
+
+ {
+ "name": "tcaVio",
+ "value": "3"
+ },
+
+ {
+ "serviceConfigurations":
+ [
+ [
+ "PMRRCCONNESTABFAILCELLLATENCY",
+ "LESS",
+ "4",
+ "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
+ ],
+
+ [
+ "PMRAATTCBRA",
+ "GREATER",
+ "30",
+ "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
+ ]
+ ]
+ }
+ ]
+ },
+
+ "CustomType_": [
+ {
+ "name": "test",
+ "value": "This is a test"
+ }
+ ]
+} \ No newline at end of file
diff --git a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
index cd76a1289..43fecc9ea 100644
--- a/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/holmes/modelBpmnProperties.json
@@ -69,13 +69,6 @@
]
},
{
- "name": "location",
- "value": [
- "SNDGCA64",
- "ALPRGAED"
- ]
- },
- {
"name": "vf",
"value": [
"f5213e3a-9191-4362-93b5-b67f8d770e44"
diff --git a/src/test/resources/example/model-properties/modelBpmn.json b/src/test/resources/example/model-properties/modelBpmn.json
deleted file mode 100644
index 8f7b8e61a..000000000
--- a/src/test/resources/example/model-properties/modelBpmn.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "policy": [
- {
- "id": "Policy_0honxgv",
- "from": "TCA_1jy9to4"
- }
- ],
- "tca": [
- {
- "id": "TCA_1jy9to4",
- "from": "Holmes_0i4n2mm"
- }
- ],
- "holmes": [
- {
- "id": "Holmes_0i4n2mm",
- "from": "VesCollector_0orydnh"
- }
- ],
- "vesCollector": [
- {
- "id": "VesCollector_0orydnh",
- "from": "StartEvent_1"
- }
- ]
-}
diff --git a/src/test/resources/example/model-properties/modelBpmnProp.json b/src/test/resources/example/model-properties/modelBpmnProp.json
deleted file mode 100644
index eacb12448..000000000
--- a/src/test/resources/example/model-properties/modelBpmnProp.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "Policy_0honxgv": {
- "policy1": [
- {
- "name": "pname",
- "value": "policy1"
- },
- {
- "name": "pid",
- "value": "0"
- },
- {
- "name": "timeout",
- "value": "345"
- },
- {
- "policyConfigurations": [
- [
- {
- "name": "maxRetries",
- "value": [
- "3"
- ]
- },
- {
- "name": "retryTimeLimit",
- "value": [
- "180"
- ]
- },
- {
- "name": "_id",
- "value": [
- "dGLuNqg"
- ]
- },
- {
- "name": "parentPolicy",
- "value": [
- ""
- ]
- },
- {
- "name": "targetResourceId",
- "value": [
- "resourceid"
- ]
- }
- ]
- ]
- }
- ]
- },
- "TCA_1jy9to4": {
- "tca1": [
- {
- "name": "tname",
- "value": "tca1"
- },
- {
- "name": "tuuid",
- "value": "f43e3499-8c9c-teed-bb41-a0cb38ebf0d3"
- },
- {
- "name": "tnfc",
- "value": ""
- },
- {
- "name": "tcaEnab",
- "value": "on"
- },
- {
- "name": "tcaPol",
- "value": "policy1"
- },
- {
- "name": "tcaPolId",
- "value": "0"
- },
- {
- "name": "tcaInt",
- "value": "1"
- },
- {
- "name": "tcaSev",
- "value": "NORMAL"
- },
- {
- "name": "tcaVio",
- "value": "1"
- },
- {
- "serviceConfigurations": [
- ]
- }
- ]
- },
- "Holmes_0i4n2mm": [
- {
- "name": "correlationalLogic",
- "value": "blabla"
- },
- {
- "name": "configPolicyName",
- "value": "policy1"
- }
- ]
-}
diff --git a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json b/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
deleted file mode 100644
index 3030adfb3..000000000
--- a/src/test/resources/example/model-properties/modelBpmnPropWithGlobal.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "tca": {
- "tname": "New_Set",
- "tcaInt": "1",
- "tcaVio": "1",
- "tcaSev": {
- "NORMAL": "NORMAL",
- "CRITICAL": "CRITICAL",
- "MAJOR": "MAJOR",
- "MINOR": "MINOR",
- "WARNING": "WARNING"
- },
- "fieldPath": {
- "FIELDPATH_test_1": "FIELDPATH_test_1",
- "FIELDPATH_test_2": "FIELDPATH_test_2"
- },
- "operator": {
- ">": "GREATER",
- "=": "EQUAL",
- "<": "LESS"
- },
- "opsPolicy": {
- "POLICY_test_X": "POLICY_test_X",
- "POLICY_test_Y": "POLICY_test_Y"
- }
- },
- "global": [
- {
- "name": "actionSet",
- "value": [
- "vnfRecipe"
- ]
- },
- {
- "name": "location",
- "value": [
- "SNDGCA64",
- "ALPRGAED"
- ]
- },
- {
- "name": "vf",
- "value": [
- "f5213e3a-9191-4362-93b5-b67f8d770e44"
- ]
- },
- {
- "name": "location",
- "value": [
- "SNDGCA64",
- "ALPRGAED",
- "LSLEILAA",
- "MDTWNJC1"
- ]
- }
- ],
- "policy": {
- "pname": "0",
- "timeout": 345,
- "vnfRecipe": {
- "": "",
- "restart": "Restart",
- "rebuild": "Rebuild",
- "migrate": "Migrate",
- "healthCheck": "Health Check",
- "evacuate": "Evacuate"
- },
- "enbRecipe": {
- "": "",
- "reset": "Reset"
- },
- "maxRetries": "3",
- "retryTimeLimit": 180,
- "resource": {
- "vCTS": "vCTS",
- "v3CDB": "v3CDB",
- "vUDR": "vUDR",
- "vCOM": "vCOM",
- "vRAR": "vRAR",
- "vLCS": "vLCS",
- "vUDR-BE": "vUDR-BE",
- "vDBE": "vDBE"
- },
- "parentPolicyConditions": {
- "Failure_Retries": "Failure: Max Retries Exceeded",
- "Failure_Timeout": "Failure: Time Limit Exceeded",
- "Failure_Guard": "Failure: Guard",
- "Failure_Exception": "Failure: Exception",
- "Failure": "Failure: Other",
- "Success": "Success"
- },
- "targetResourceId": "resourceid"
- },
- "shared": {
- "byService": {
- "": {
- "vf": {
- "": ""
- },
- "location": {
- "": ""
- },
- "alarmCondition": {
- "": ""
- }
- }
- },
- "byVf": {
- "": {
- "vfc": {
- "": ""
- }
- }
- }
- }
-}
diff --git a/src/test/resources/example/modelBpmnPropForPolicy.json b/src/test/resources/example/model-properties/policy/modelBpmn.json
index de643a69a..de643a69a 100644
--- a/src/test/resources/example/modelBpmnPropForPolicy.json
+++ b/src/test/resources/example/model-properties/policy/modelBpmn.json
diff --git a/src/test/resources/example/modelProp.json b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
index 99f67b62e..99f67b62e 100644
--- a/src/test/resources/example/modelProp.json
+++ b/src/test/resources/example/model-properties/policy/modelBpmnProperties.json
diff --git a/src/test/resources/example/model-properties/tca/modelBpmnProperties.json b/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
index 7bb4fe0bb..8e2780cda 100644
--- a/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
+++ b/src/test/resources/example/model-properties/tca/modelBpmnProperties.json
@@ -101,20 +101,13 @@
{
"name": "service",
"value": [
- "serviceUUID"
- ]
- },
- {
- "name": "location",
- "value": [
- "SNDGCA64",
- "ALPRGAED"
+ "4cc5b45a-1f63-4194-8100-cd8e14248c92"
]
},
{
"name": "vf",
"value": [
- "f5213e3a-9191-4362-93b5-b67f8d770e44"
+ "023a3f0d-1161-45ff-b4cf-8918a8ccf3ad"
]
},
{
diff --git a/src/test/resources/example/modelPropForPolicy.json b/src/test/resources/example/modelPropForPolicy.json
deleted file mode 100644
index bf3480924..000000000
--- a/src/test/resources/example/modelPropForPolicy.json
+++ /dev/null
@@ -1,432 +0,0 @@
-{
- "global":
- [
- {
- "name": "service",
- "value":
- [
- "0f983e18-4603-4bb4-a98c-e29691fb16a1"
- ]
- },
-
- {
- "name": "vf",
- "value":
- [
- "6c7aaec2-59eb-41d9-8681-b7f976ab668d"
- ]
- },
-
- {
- "name": "location",
- "value":
- [
- "SNDGCA64"
- ]
- }
- ],
-
- "Policy_":
- {
- "Policy1":
- [
- {
- "name": "pname",
- "value": "Policy1"
- },
-
- {
- "name": "pid",
- "value": "1"
- },
-
- {
- "name": "timeout",
- "value": "500"
- },
-
- {
- "policyConfigurations":
- [
- [
- {
- "name": "recipe",
- "value":
- [
- "restart"
- ]
- },
-
- {
- "name": "maxRetries",
- "value":
- [
- "3"
- ]
- },
-
- {
- "name": "retryTimeLimit",
- "value":
- [
- "180"
- ]
- },
-
- {
- "name": "_id",
- "value":
- [
- "n9bQ4t6"
- ]
- },
-
- {
- "name": "parentPolicy",
- "value":
- [
- ""
- ]
- },
- {
- "name": "targetResourceId",
- "value":
- [
- "resource-id"
- ]
- }
- ],
-
- [
- {
- "name": "recipe",
- "value":
- [
- "rebuild"
- ]
- },
-
- {
- "name": "maxRetries",
- "value":
- [
- "3"
- ]
- },
-
- {
- "name": "retryTimeLimit",
- "value":
- [
- "180"
- ]
- },
-
- {
- "name": "_id",
- "value":
- [
- "ItE5xKT"
- ]
- },
-
- {
- "name": "parentPolicy",
- "value":
- [
- "n9bQ4t6"
- ]
- },
-
- {
- "name": "parentPolicyConditions",
- "value":
- [
- "Failure_Retries",
- "Failure_Timeout",
- "Failure_Exception",
- "Failure"
- ]
- },
- {
- "name": "targetResourceId",
- "value":
- [
- "resource-id"
- ]
- }
- ]
- ]
- }
- ],
-
- "Policy2":
- [
- {
- "name": "pname",
- "value": "Policy2"
- },
-
- {
- "name": "pid",
- "value": "2"
- },
-
- {
- "name": "timeout",
- "value": "500"
- },
-
- {
- "policyConfigurations":
- [
- [
- {
- "name": "recipe",
- "value":
- [
- "restart"
- ]
- },
-
- {
- "name": "maxRetries",
- "value":
- [
- "3"
- ]
- },
-
- {
- "name": "retryTimeLimit",
- "value":
- [
- "180"
- ]
- },
-
- {
- "name": "_id",
- "value":
- [
- "n9bQ4t6"
- ]
- },
-
- {
- "name": "parentPolicy",
- "value":
- [
- ""
- ]
- },
- {
- "name": "targetResourceId",
- "value":
- [
- "resource-id"
- ]
- }
- ],
-
- [
- {
- "name": "recipe",
- "value":
- [
- "rebuild"
- ]
- },
-
- {
- "name": "maxRetries",
- "value":
- [
- "3"
- ]
- },
-
- {
- "name": "retryTimeLimit",
- "value":
- [
- "180"
- ]
- },
-
- {
- "name": "_id",
- "value":
- [
- "ItE5xKT"
- ]
- },
-
- {
- "name": "parentPolicy",
- "value":
- [
- "n9bQ4t6"
- ]
- },
-
- {
- "name": "parentPolicyConditions",
- "value":
- [
- "Failure_Retries",
- "Failure_Timeout",
- "Failure_Exception",
- "Failure"
- ]
- },
- {
- "name": "targetResourceId",
- "value":
- [
- "resource-id"
- ]
- }
- ]
- ]
- }
- ]
- },
-
- "TCA_":
- {
- "Narra":
- [
- {
- "name": "tname",
- "value": "Narra"
- },
-
- {
- "name": "tuuid",
- "value": "886be8da-14fe-tca1-d04b-d13b55d58df9"
- },
-
- {
- "name": "tnfc",
- "value": "ENBE"
- },
-
- {
- "name": "tcaEnab",
- "value": "on"
- },
-
- {
- "name": "tcaPol",
- "value": "Policy1"
- },
-
- {
- "name": "tcaPolId",
- "value": "1"
- },
-
- {
- "name": "tcaInt",
- "value": "2"
- },
-
- {
- "name": "tcaSev",
- "value": "Warning"
- },
-
- {
- "name": "tcaVio",
- "value": "3"
- },
-
- {
- "serviceConfigurations":
- [
- [
- "PMRRCCONNESTABFAILCELLLATENCY",
- "LESS",
- "4",
- "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
- ],
-
- [
- "PMRAATTCBRA",
- "GREATER",
- "30",
- "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
- ]
- ]
- }
- ],
-
- "Srini":
- [
- {
- "name": "tname",
- "value": "Srini"
- },
-
- {
- "name": "tuuid",
- "value": "8b5ba88d-f4b4-tf0e-50b1-78a5a7dd412d"
- },
-
- {
- "name": "tnfc",
- "value": "ENBE"
- },
-
- {
- "name": "tcaEnab",
- "value": "on"
- },
-
- {
- "name": "tcaPol",
- "value": "Policy2"
- },
-
- {
- "name": "tcaPolId",
- "value": "2"
- },
-
- {
- "name": "tcaInt",
- "value": "10"
- },
-
- {
- "name": "tcaSev",
- "value": "Critical"
- },
-
- {
- "name": "tcaVio",
- "value": "5"
- },
-
- {
- "serviceConfigurations":
- [
- [
- "PMRRCCONNESTABFAILCELLLATENCY",
- "EQUAL",
- "3",
- "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRRCCONNESTABFAILCELLLATENCY')].Value"
- ],
-
- [
- "PMRAATTCBRA",
- "GREATER",
- "30",
- "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[?(@.Name == 'PMRAATTCBRA')].Value"
- ]
- ]
- }
- ]
- }
-} \ No newline at end of file
diff --git a/src/test/resources/example/sdc/expected-result/all-sdc-services.json b/src/test/resources/example/sdc/expected-result/all-sdc-services.json
new file mode 100644
index 000000000..ea6efddb4
--- /dev/null
+++ b/src/test/resources/example/sdc/expected-result/all-sdc-services.json
@@ -0,0 +1,6 @@
+{
+ "service": {
+ "4cc5b45a-1f63-4194-8100-cd8e14248c92": "vFirewall",
+ "c95b0e7c-c1f0-4287-9928-7964c5377a46": "vLoadBalancer"
+ }
+}
diff --git a/src/test/resources/example/tca-policy-req/blueprint-expected.yaml b/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
index 2082e559b..8739bb22f 100644
--- a/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
+++ b/src/test/resources/example/tca-policy-req/blueprint-expected.yaml
@@ -1,7 +1,7 @@
tosca_definitions_version: cloudify_dsl_1_3
-imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml',
- 'https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml',
- 'http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml']
+imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml',
+ 'https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml',
+ 'http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml']
inputs:
location_id: {type: string}
service_id: {type: string}
@@ -10,7 +10,7 @@ node_templates:
type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
properties:
location_id: {get_input: location_id}
- scn_override: cdap_broker.solutioning-central.dcae.att.com
+ scn_override: cdap_broker.solutioning-central.dcae.onap.org
interfaces:
cloudify.interfaces.lifecycle: {}
tca_tca:
@@ -21,15 +21,15 @@ node_templates:
tcaVESAlertsTableName: TCAVESAlertsTable, tcaVESAlertsTableTTLSeconds: '1728000',
tcaVESMessageStatusTableName: TCAVESMessageStatusTable, tcaVESMessageStatusTableTTLSeconds: '86400',
thresholdCalculatorFlowletInstances: '2'}
- app_preferences: {publisherContentType: application/json, publisherHostName: mrlocal-mtnjftle01.homer.att.com,
+ app_preferences: {publisherContentType: application/json, publisherHostName: mrlocal-mtnjftle01.onap.org,
publisherHostPort: '3905', publisherMaxBatchSize: '10', publisherMaxRecoveryQueueSize: '100000',
- publisherPollingInterval: '20000', publisherProtocol: https, publisherTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESPub,
- publisherUserName: m00502@tca.af.dcae.att.com, publisherUserPassword: Te5021abc,
+ publisherPollingInterval: '20000', publisherProtocol: https, publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub,
+ publisherUserName: m00502@tca.af.dcae.onap.org, publisherUserPassword: Te5021abc,
subscriberConsumerGroup: OpenDCAE-c12, subscriberConsumerId: c12, subscriberContentType: application/json,
- subscriberHostName: mrlocal-mtnjftle01.homer.att.com, subscriberHostPort: '3905',
+ subscriberHostName: mrlocal-mtnjftle01.onap.org, subscriberHostPort: '3905',
subscriberMessageLimit: '-1', subscriberPollingInterval: '20000', subscriberProtocol: https,
- subscriberTimeoutMS: '-1', subscriberTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESSub,
- subscriberUserName: m00502@tca.af.dcae.att.com, subscriberUserPassword: Te5021abc,
+ subscriberTimeoutMS: '-1', subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub,
+ subscriberUserName: m00502@tca.af.dcae.onap.org, subscriberUserPassword: Te5021abc,
tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta","thresholdValue":123,"direction":"GREATER_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta","thresholdValue":123,"direction":"GREATER_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"}]}]}'}
artifact_name: dcae-analytics-tca
artifact_version: 1.0.0
diff --git a/src/test/resources/example/tca-policy-req/blueprint-input.yaml b/src/test/resources/example/tca-policy-req/blueprint-input.yaml
index 95322258e..101dc2c0d 100644
--- a/src/test/resources/example/tca-policy-req/blueprint-input.yaml
+++ b/src/test/resources/example/tca-policy-req/blueprint-input.yaml
@@ -1,9 +1,9 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
-- http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
+- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
+- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
inputs:
location_id:
type: string
@@ -15,9 +15,10 @@ node_templates:
properties:
location_id:
get_input: location_id
- scn_override: cdap_broker.solutioning-central.dcae.att.com
+ scn_override: cdap_broker.solutioning-central.dcae.onap.org
interfaces:
- cloudify.interfaces.lifecycle: {}
+ cloudify.interfaces.lifecycle: {
+ }
tca_tca:
type: dcae.nodes.MicroService.cdap
properties:
@@ -32,33 +33,35 @@ node_templates:
thresholdCalculatorFlowletInstances: '2'
app_preferences:
publisherContentType: application/json
- publisherHostName: mrlocal-mtnjftle01.homer.att.com
+ publisherHostName: mrlocal-mtnjftle01.onap.org
publisherHostPort: '3905'
publisherMaxBatchSize: '10'
publisherMaxRecoveryQueueSize: '100000'
publisherPollingInterval: '20000'
publisherProtocol: https
- publisherTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESPub
- publisherUserName: m00502@tca.af.dcae.att.com
+ publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub
+ publisherUserName: m00502@tca.af.dcae.onap.org
publisherUserPassword: Te5021abc
subscriberConsumerGroup: OpenDCAE-c12
subscriberConsumerId: c12
subscriberContentType: application/json
- subscriberHostName: mrlocal-mtnjftle01.homer.att.com
+ subscriberHostName: mrlocal-mtnjftle01.onap.org
subscriberHostPort: '3905'
subscriberMessageLimit: '-1'
subscriberPollingInterval: '20000'
subscriberProtocol: https
subscriberTimeoutMS: '-1'
- subscriberTopicName: com.att.dcae.dmaap.mtnje2.DcaeTestVESSub
- subscriberUserName: m00502@tca.af.dcae.att.com
+ subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub
+ subscriberUserName: m00502@tca.af.dcae.onap.org
subscriberUserPassword: Te5021abc
- tca_policy:
+ tca_policy: null
artifact_name: dcae-analytics-tca
artifact_version: 1.0.0
connections:
- streams_publishes: []
- streams_subscribes: []
+ streams_publishes: [
+ ]
+ streams_subscribes: [
+ ]
jar_url: http://somejar
location_id:
get_input: location_id
@@ -76,4 +79,4 @@ node_templates:
streamname: TCASubscriberOutputStream
relationships:
- target: cdap_host_host
- type: dcae.relationships.component_contained_in
+ type: dcae.relationships.component_contained_in \ No newline at end of file
diff --git a/src/test/resources/example/tca-policy-req/prop-text.json b/src/test/resources/example/tca-policy-req/prop-text.json
new file mode 100644
index 000000000..acaa8894f
--- /dev/null
+++ b/src/test/resources/example/tca-policy-req/prop-text.json
@@ -0,0 +1 @@
+{"global":[{"name":"service","value":["tosca_definitions_version: cloudify_dsl_1_3\r\nimports:\r\n- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml\r\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml\r\n- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml\r\n- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml\r\ninputs:\r\n location_id:\r\n type: string\r\n service_id:\r\n type: string\r\nnode_templates:\r\n cdap_host_host:\r\n type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure\r\n properties:\r\n location_id:\r\n get_input: location_id\r\n scn_override: cdap_broker.solutioning-central.dcae.onap.org\r\n interfaces:\r\n cloudify.interfaces.lifecycle: {\r\n }\r\n tca_tca:\r\n type: dcae.nodes.MicroService.cdap\r\n properties:\r\n app_config:\r\n appDescription: DCAE Analytics Threshold Crossing Alert Application\r\n appName: dcae-tca\r\n tcaSubscriberOutputStreamName: TCASubscriberOutputStream\r\n tcaVESAlertsTableName: TCAVESAlertsTable\r\n tcaVESAlertsTableTTLSeconds: '1728000'\r\n tcaVESMessageStatusTableName: TCAVESMessageStatusTable\r\n tcaVESMessageStatusTableTTLSeconds: '86400'\r\n thresholdCalculatorFlowletInstances: '2'\r\n app_preferences:\r\n publisherContentType: application/json\r\n publisherHostName: mrlocal-mtnjftle01.onap.org\r\n publisherHostPort: '3905'\r\n publisherMaxBatchSize: '10'\r\n publisherMaxRecoveryQueueSize: '100000'\r\n publisherPollingInterval: '20000'\r\n publisherProtocol: https\r\n publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub\r\n publisherUserName: m00502@tca.af.dcae.onap.org\r\n publisherUserPassword: Te5021abc\r\n subscriberConsumerGroup: OpenDCAE-c12\r\n subscriberConsumerId: c12\r\n subscriberContentType: application/json\r\n subscriberHostName: mrlocal-mtnjftle01.onap.org\r\n subscriberHostPort: '3905'\r\n subscriberMessageLimit: '-1'\r\n subscriberPollingInterval: '20000'\r\n subscriberProtocol: https\r\n subscriberTimeoutMS: '-1'\r\n subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub\r\n subscriberUserName: m00502@tca.af.dcae.onap.org\r\n subscriberUserPassword: Te5021abc\r\n tca_policy: '{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"vFirewallBroadcastPackets\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"example_model01.ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_TCA_1jy9to4\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\",\"thresholdValue\":123,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"},{\"closedLoopControlName\":\"ClosedLoop_FRWL_SIG_fad4dcae_e498_11e6_852e_0050568c4ccf_null\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta\",\"thresholdValue\":123,\"direction\":\"GREATER_OR_EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ONSET\"}]}]}'\r\n artifact_name: dcae-analytics-tca\r\n artifact_version: 1.0.0\r\n connections:\r\n streams_publishes: [\r\n ]\r\n streams_subscribes: [\r\n ]\r\n jar_url: http://somejar\r\n location_id:\r\n get_input: location_id\r\n namespace: cdap_tca_hi_lo\r\n programs:\r\n - program_id: TCAVESCollectorFlow\r\n program_type: flows\r\n - program_id: TCADMaaPMRSubscriberWorker\r\n program_type: workers\r\n - program_id: TCADMaaPMRPublisherWorker\r\n program_type: workers\r\n service_component_type: cdap_app_tca\r\n service_id:\r\n get_input: service_id\r\n streamname: TCASubscriberOutputStream\r\n relationships:\r\n - target: cdap_host_host\r\n type: dcae.relationships.component_contained_in"]}]} \ No newline at end of file
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index 54005ef2c..82cd999c3 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -77,42 +77,15 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
camel.springboot.consumer-template-cache-size=1000
camel.springboot.producer-template-cache-size=1000
-camel.springboot.jmx-enabled=true
+camel.springboot.jmx-enabled=false
camel.defaultthreadpool.poolsize=10
camel.defaultthreadpool.maxpoolsize=20
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-
-#server.port=0
-#Camunda Process Engine DataSource connection Details
-spring.datasource.camunda.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.camunda.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/camundabpm?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.camunda.username=camunda
-spring.datasource.camunda.password=e1bb2a8381d1aa6c09879bd627db3bb560ad29e8a3343fe6aa7e6a7ba622da4e
-spring.datasource.camunda.validationQuery=SELECT 1
-spring.datasource.camunda.validationQueryTimeout=20000
-spring.datasource.camunda.validationInterval=30000
-spring.datasource.camunda.testWhileIdle = true
-spring.datasource.camunda.minIdle = 0
-spring.datasource.camunda.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.camunda.testOnBorrow=true
-spring.datasource.camunda.ignoreExceptionOnPreLoad=true
-
-
-#Camunda application properties
-#Camunda history level
-camunda.bpm.history-level=none
-camunda.bpm.enabled=false
-camunda.bpm.jpa.enabled=false
-camunda.bpm.auto-deployment-enabled=false
-camunda.bpm.job-execution.active=false
-camunda.bpm.job-execution.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.metrics.enabled=false
-camunda.bpm.management.health.camunda.enabled=false
-camunda.bpm.database.schema-update=true
+#camel.springboot.xmlRoutes = false
+camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml
+#camel.springboot.typeConversion = false
#clds datasource connection details
spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver