Update dependencies to remove some issues reported by Nexus-IQ.
Issue-ID: POLICY-3169
Issue-ID: POLICY-3120
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ia8939f0c85ac4087c3fc2c71b66914d6c7178347
"spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clampdb.{{ include "common.namespace" . }}:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
"clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
"clamp.config.dcae.inventory.url": "https://inventory.{{ include "common.namespace" . }}:8080",
- "clamp.config.dcae.dispatcher.url": "https4://deployment-handler.{{ include "common.namespace" . }}:8443",
- "clamp.config.dcae.deployment.url": "https4://deployment-handler.{{ include "common.namespace" . }}:8443",
+ "clamp.config.dcae.dispatcher.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443",
+ "clamp.config.dcae.deployment.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443",
"clamp.config.dcae.deployment.userName": "none",
"clamp.config.dcae.deployment.password": "none",
- "clamp.config.policy.api.url": "https4://policy-api.{{ include "common.namespace" . }}:6969",
+ "clamp.config.policy.api.url": "https://policy-api.{{ include "common.namespace" . }}:6969",
"clamp.config.policy.api.userName": "healthcheck",
"clamp.config.policy.api.password": "zb!XztG34",
- "clamp.config.policy.pap.url": "https4://policy-pap.{{ include "common.namespace" . }}:6969",
+ "clamp.config.policy.pap.url": "https://policy-pap.{{ include "common.namespace" . }}:6969",
"clamp.config.policy.pap.userName": "healthcheck",
"clamp.config.policy.pap.password": "zb!XztG34",
"clamp.config.cadi.aafLocateUrl": "https://aaf-locate.{{ include "common.namespace" . }}:8095",
### Be careful, this must be in one line only ###
-SPRING_APPLICATION_JSON={"spring.datasource.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3","spring.profiles.active":"clamp-default,clamp-default-user,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,default-dictionary-elements","clamp.config.policy.api.url":"http4://third-party-proxy:8085","clamp.config.policy.pap.url":"http4://third-party-proxy:8085","clamp.config.dcae.inventory.url":"http://third-party-proxy:8085","clamp.config.dcae.deployment.url":"http4://third-party-proxy:8085"}
+SPRING_APPLICATION_JSON={"spring.datasource.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3","spring.profiles.active":"clamp-default,clamp-default-user,clamp-sdc-controller,clamp-ssl-config,clamp-policy-controller,default-dictionary-elements","clamp.config.policy.api.url":"http://third-party-proxy:8085","clamp.config.policy.pap.url":"http://third-party-proxy:8085","clamp.config.dcae.inventory.url":"http://third-party-proxy:8085","clamp.config.dcae.deployment.url":"http://third-party-proxy:8085"}
- The ONAP POLICY-CLAMP JAR that contains CLAMP back-end code.
- The DOCKER images for:
* POLICY-CLAMP backend (Java Spring)
- * POLICY-CLAMP frontend (Javscript React)
+ * POLICY-CLAMP frontend (Javascript React)
It can test:
- The POLICY-CLAMP backend, JAVA unit testing
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eelf.core.version>1.0.0</eelf.core.version>
- <camel.version>2.25.3</camel.version>
- <springboot.version>2.2.13.RELEASE</springboot.version>
+ <camel.version>3.7.3</camel.version>
+ <springboot.version>2.4.4</springboot.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
<docker.skip.tag>true</docker.skip.tag>
<skip.staging.artifacts>false</skip.staging.artifacts>
<python.http.proxy.param/>
- <tomcat.version>9.0.37</tomcat.version>
+ <tomcat.version>9.0.45</tomcat.version>
<ui.react.src>ui-react</ui.react.src>
<ui.react.lib.src>ui-react-lib</ui.react.lib.src>
<npm.publish.url>https://nexus3.onap.org/repository/npm.snapshot/</npm.publish.url>
</dependency>
<!-- Camel BOM -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-dependencies</artifactId>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-bom</artifactId>
<version>${camel.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- For CAMEL -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http4-starter</artifactId>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-http-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jaxb-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-servlet-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-gson-starter</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
+ <groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-swagger-java-starter</artifactId>
<exclusions>
<exclusion>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
- <version>2.2</version>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>5.2.3.RELEASE</version>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
<version>1.0.1.Final</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>27.0-jre</version>
- </dependency>
+
<!-- Remove the MYSQL connector and replace it by Mariadb -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.6.2</version>
+ <version>2.7.2</version>
</dependency>
<!-- For SDC Controller -->
<dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.26</version>
+ <version>1.28</version>
</dependency>
<dependency>
<groupId>org.dom4j</groupId>
<!-- TESTING -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>5.7.1</version>
<scope>test</scope>
- <version>4.13</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<version>3.10.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
- <version>3.2.1</version>
+ <version>3.2.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
- <version>3.2.1</version>
+ <version>3.2.7</version>
<scope>test</scope>
</dependency>
<dependency>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>jar-with-only-classes</id>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.0</version>
<executions>
<execution>
<goals>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.31.0</version>
+ <version>0.35.0</version>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.8.0</version>
+ <version>1.11.3</version>
<configuration>
<installDirectory>${project.build.directory}/${ui.react.src}</installDirectory>
<npmDownloadRoot>${repo.npm}</npmDownloadRoot>
</goals>
<phase>generate-sources</phase>
<configuration>
- <nodeVersion>v12.13.0</nodeVersion>
- <npmVersion>6.13.0</npmVersion>
+ <nodeVersion>v14.16.1</nodeVersion>
+ <npmVersion>6.14.12</npmVersion>
</configuration>
</execution>
<execution>
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Modifications Copyright (c) 2019 Samsung
public class AuthorizationController {
protected static final EELFLogger logger =
- EELFManager.getInstance().getLogger(AuthorizationController.class);
+ EELFManager.getInstance().getLogger(AuthorizationController.class);
protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- protected static final EELFLogger securityLogger =
- EELFManager.getInstance().getSecurityLogger();
+ protected static final EELFLogger securityLogger = EELFManager.getInstance().getSecurityLogger();
// By default we'll set it to a default handler
@Autowired
private ClampProperties refProp;
- private SecurityContext securityContext = SecurityContextHolder.getContext();
-
public static final String PERM_PREFIX = "security.permission.type.";
private static final String PERM_INSTANCE = "security.permission.instance";
*/
public static String getPrincipalName(SecurityContext securityContext) {
String principal = AuthorizationController.retrieveUserName(securityContext);
- String name = "Not found";
- if (principal != null) {
- name = principal;
- }
- return name;
+ return principal != null ? principal : "Not found";
}
/**
* Insert authorize the api based on the permission.
*
* @param camelExchange The Camel Exchange object containing the properties
- * @param typeVar The type of the permissions
- * @param instanceVar The instance of the permissions. e.g. dev
- * @param action The action of the permissions. e.g. read
+ * @param typeVar The type of the permissions
+ * @param instanceVar The instance of the permissions. e.g. dev
+ * @param action The action of the permissions. e.g. read
*/
public void authorize(Exchange camelExchange, String typeVar, String instanceVar,
- String action) {
+ String action) {
String type = refProp.getStringValue(PERM_PREFIX + typeVar);
String instance = refProp.getStringValue(PERM_INSTANCE);
if (null != instanceVar && !instanceVar.isEmpty()) {
instance = instanceVar;
}
- String principalName = AuthorizationController.getPrincipalName(this.securityContext);
+ String principalName = AuthorizationController.getPrincipalName(SecurityContextHolder.getContext());
SecureServicePermission perm = SecureServicePermission.create(type, instance, action);
Date startTime = new Date();
LoggingUtils.setTargetContext("Clamp", "authorize");
*/
public boolean isUserPermitted(SecureServicePermission inPermission) {
- String principalName = AuthorizationController.getPrincipalName(this.securityContext);
+ String principalName = AuthorizationController.getPrincipalName(SecurityContextHolder.getContext());
// check if the user has the permission key or the permission key with a
// combination of all instance and/or all action.
if (hasRole(inPermission.getKey()) || hasRole(inPermission.getKeyAllInstance())) {
auditLogger.info("{} authorized because user has permission with * for instance: {}",
- principalName, inPermission.getKey().replace("|", ":"));
+ principalName, inPermission.getKey().replace("|", ":"));
return true;
// the rest of these don't seem to be required - isUserInRole method
// appears to take * as a wildcard
} else if (hasRole(inPermission.getKeyAllInstanceAction())) {
auditLogger.info(
- "{} authorized because user has permission with * for instance and * for action: {}",
- principalName, inPermission.getKey().replace("|", ":"));
+ "{} authorized because user has permission with * for instance and * for action: {}",
+ principalName, inPermission.getKey().replace("|", ":"));
return true;
} else if (hasRole(inPermission.getKeyAllAction())) {
auditLogger.info("{} authorized because user has permission with * for action: {}",
- principalName, inPermission.getKey().replace("|", ":"));
+ principalName, inPermission.getKey().replace("|", ":"));
return true;
} else {
return false;
}
protected boolean hasRole(String role) {
- Authentication authentication = securityContext.getAuthentication();
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return false;
}
*/
public ClampInformation getClampInformation() {
ClampInformation clampInfo = new ClampInformation();
- Authentication authentication = securityContext.getAuthentication();
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication == null) {
return new ClampInformation();
}
- clampInfo.setUserName(AuthorizationController.getPrincipalName(this.securityContext));
+ clampInfo.setUserName(AuthorizationController.getPrincipalName(SecurityContextHolder.getContext()));
for (GrantedAuthority auth : authentication.getAuthorities()) {
clampInfo.getAllPermissions().add(auth.getAuthority());
}
package org.onap.policy.clamp.authorization;
-
-import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
@Controller
public class UserService {
- private SecurityContext securityContext = SecurityContextHolder.getContext();
-
/**
* REST service that returns the username.
*
* @return the user name
*/
public String getUser() {
- return AuthorizationController.getPrincipalName(securityContext);
+ return AuthorizationController.getPrincipalName(SecurityContextHolder.getContext());
}
}
\ No newline at end of file
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Modifications Copyright (c) 2019 Samsung
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Enumeration;
+import org.apache.camel.component.servlet.springboot.ServletMappingAutoConfiguration;
import org.apache.catalina.connector.Connector;
import org.onap.policy.clamp.clds.util.ClampVersioning;
import org.onap.policy.clamp.clds.util.ResourceFileUtils;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-@ComponentScan(basePackages = { "org.onap.policy.clamp" })
-@SpringBootApplication(exclude = { SecurityAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class })
-@EnableJpaRepositories(basePackages = { "org.onap.policy.clamp" })
-@EntityScan(basePackages = { "org.onap.policy.clamp" })
+@ComponentScan(basePackages = {"org.onap.policy.clamp"})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, UserDetailsServiceAutoConfiguration.class,
+ ServletMappingAutoConfiguration.class})
+@EnableJpaRepositories(basePackages = {"org.onap.policy.clamp"})
+@EntityScan(basePackages = {"org.onap.policy.clamp"})
@EnableTransactionManagement
@EnableConfigurationProperties
@EnableAsync
return application.sources(Application.class);
}
+ /**
+ * Main method that starts the Clamp backend.
+ * @param args app params
+ */
public static void main(String[] args) {
// Start the Spring application
SpringApplication.run(Application.class, args);
public CdsBpWorkFlowListResponse getBlueprintWorkflowList(String blueprintName, String blueprintVersion) {\r
LoggingUtils.setTargetContext("CDS", "getBlueprintWorkflowList");\r
\r
- Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext)\r
- .withProperty("blueprintName", blueprintName).withProperty("blueprintVersion", blueprintVersion)\r
- .build();\r
-\r
Exchange exchangeResponse = camelContext.createProducerTemplate()\r
- .send("direct:get-blueprint-workflow-list", myCamelExchange);\r
+ .send("direct:get-blueprint-workflow-list", ExchangeBuilder.anExchange(camelContext)\r
+ .withProperty("blueprintName", blueprintName).withProperty("blueprintVersion", blueprintVersion)\r
+ .withProperty("raiseHttpExceptionFlag", true).build());\r
\r
if (Integer.valueOf(200).equals(exchangeResponse.getIn().getHeader("CamelHttpResponseCode"))) {\r
String cdsResponse = (String) exchangeResponse.getIn().getBody();\r
String workflow) {\r
LoggingUtils.setTargetContext("CDS", "getWorkflowInputProperties");\r
\r
- Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext)\r
- .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow))\r
- .build();\r
-\r
Exchange exchangeResponse = camelContext.createProducerTemplate()\r
- .send("direct:get-blueprint-workflow-input-properties", myCamelExchange);\r
+ .send("direct:get-blueprint-workflow-input-properties", ExchangeBuilder.anExchange(camelContext)\r
+ .withBody(getCdsPayloadForWorkFlow(blueprintName, blueprintVersion, workflow))\r
+ .withProperty("raiseHttpExceptionFlag", true).build());\r
\r
if (Integer.valueOf(200).equals(exchangeResponse.getIn().getHeader("CamelHttpResponseCode"))) {\r
String cdsResponse = (String) exchangeResponse.getIn().getBody();\r
}\r
\r
private void handleListType(String propertyName,\r
- JsonObject inputProperty,\r
- JsonObject dataTypes,\r
- JsonObject inputObject) {\r
+ JsonObject inputProperty,\r
+ JsonObject dataTypes,\r
+ JsonObject inputObject) {\r
if (inputProperty.get("entry_schema") == null) {\r
throw new CdsParametersException("Entry schema is null for " + propertyName);\r
}\r
for (int i = 0; i < retryLimit; i++) {\r
Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext)\r
.withProperty("blueprintResourceId", resourceUuid).withProperty("blueprintServiceId", serviceUuid)\r
- .withProperty("blueprintName", artifactName).build();\r
+ .withProperty("blueprintName", artifactName).withProperty("raiseHttpExceptionFlag", true).build();\r
metricsLogger.info("Attempt n°" + i + " to contact DCAE inventory");\r
\r
Exchange exchangeResponse = camelContext.createProducerTemplate()\r
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
+ * Copyright (C) 2018, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.clamp.clds.config;
import java.io.IOException;
-import java.net.URL;
import java.security.KeyManagementException;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
+import java.util.Objects;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManagerFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http4.HttpClientConfigurer;
-import org.apache.camel.component.http4.HttpComponent;
+import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.model.rest.RestBindingMode;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLSocketFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.onap.policy.clamp.clds.util.ClampVersioning;
import org.onap.policy.clamp.clds.util.ResourceFileUtils;
import org.onap.policy.clamp.util.PassDecoder;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@Component
public class CamelConfiguration extends RouteBuilder {
+ private static final String HTTP = "http";
+ private static final String HTTPS = "https";
+
@Autowired
CamelContext camelContext;
+ @Value("${server.ssl.key-store:#{null}}")
+ private String keyStore;
+
+ @Value("${server.ssl.key-store-type:JKS}")
+ private String keyStoreType;
+
+ @Value("${server.ssl.key-store-password:#{null}}")
+ private String keyStorePass;
+
+ @Value("${server.ssl.trust-store:#{null}}")
+ private String trustStore;
+
+ @Value("${server.ssl.trust-store-password:#{null}}")
+ private String trustStorePass;
+
+ @Value("${server.ssl.trust-store-type:JKS}")
+ private String trustStoreType;
+
+ @Value("${server.ssl.trust-store-algorithm:PKIX}")
+ private String trustStoreAlgorithm;
+
+ @Value("${clamp.config.httpclient.connectTimeout:-1}")
+ private int connectTimeout;
+
+ @Value("${clamp.config.httpclient.connectRequestTimeout:-1}")
+ private int connectRequestTimeout;
+
+ @Value("${clamp.config.httpclient.socketTimeout:-1}")
+ private int socketTimeout;
+
+ @Value("${clamp.config.keyFile:#{null}}")
+ private String keyFile;
+
+
@Autowired
- private Environment env;
-
- private void configureDefaultSslProperties() throws IOException {
- if (env.getProperty("server.ssl.trust-store") != null) {
- URL storeResource = Thread.currentThread().getContextClassLoader()
- .getResource(env.getProperty("server.ssl.trust-store").replaceFirst("classpath:", ""));
- System.setProperty("javax.net.ssl.trustStore", storeResource.getPath());
- String keyFile = env.getProperty("clamp.config.keyFile");
- String trustStorePass = PassDecoder.decode(env.getProperty("server.ssl.trust-store-password"),
- keyFile);
- System.setProperty("javax.net.ssl.trustStorePassword", trustStorePass);
- System.setProperty("javax.net.ssl.trustStoreType", "jks");
- System.setProperty("ssl.TrustManagerFactory.algorithm", "PKIX");
- storeResource = Thread.currentThread().getContextClassLoader()
- .getResource(env.getProperty("server.ssl.key-store").replaceFirst("classpath:", ""));
- System.setProperty("javax.net.ssl.keyStore", storeResource.getPath());
-
- String keyStorePass = PassDecoder.decode(env.getProperty("server.ssl.key-store-password"),
- keyFile);
- System.setProperty("javax.net.ssl.keyStorePassword", keyStorePass);
- System.setProperty("javax.net.ssl.keyStoreType", env.getProperty("server.ssl.key-store-type"));
+ private ClampProperties clampProperties;
+
+ private void configureDefaultSslProperties() {
+ if (trustStore != null) {
+ System.setProperty("javax.net.ssl.trustStore", Thread.currentThread().getContextClassLoader()
+ .getResource(trustStore.replaceFirst("classpath:", "")).getPath());
+ System.setProperty("javax.net.ssl.trustStorePassword", Objects.requireNonNull(
+ PassDecoder.decode(trustStorePass, keyFile)));
+ System.setProperty("javax.net.ssl.trustStoreType", trustStoreType);
+ System.setProperty("ssl.TrustManagerFactory.algorithm", trustStoreAlgorithm);
+ }
+ if (keyStore != null) {
+ System.setProperty("javax.net.ssl.keyStore", Thread.currentThread().getContextClassLoader()
+ .getResource(keyStore.replaceFirst("classpath:", "")).getPath());
+ System.setProperty("javax.net.ssl.keyStorePassword", Objects.requireNonNull(
+ PassDecoder.decode(keyStorePass, keyFile)));
+ System.setProperty("javax.net.ssl.keyStoreType", keyStoreType);
}
+
}
- private void registerTrustStore()
- throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException, CertificateException, IOException {
- if (env.getProperty("server.ssl.trust-store") != null) {
- KeyStore truststore = KeyStore.getInstance("JKS");
- String keyFile = env.getProperty("clamp.config.keyFile");
- String password = PassDecoder.decode(env.getProperty("server.ssl.trust-store-password"), keyFile);
- truststore.load(
- ResourceFileUtils.getResourceAsStream(env.getProperty("server.ssl.trust-store")),
- password.toCharArray());
+ private void configureCamelHttpComponent()
+ throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException, CertificateException,
+ IOException {
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(connectTimeout)
+ .setConnectionRequestTimeout(connectRequestTimeout)
+ .setSocketTimeout(socketTimeout).build();
- TrustManagerFactory trustFactory = TrustManagerFactory.getInstance("PKIX");
+ if (trustStore != null) {
+ KeyStore truststore = KeyStore.getInstance(trustStoreType);
+ truststore.load(
+ ResourceFileUtils.getResourceAsStream(trustStore),
+ Objects.requireNonNull(PassDecoder.decode(trustStorePass, keyFile)).toCharArray());
+ TrustManagerFactory trustFactory = TrustManagerFactory.getInstance(trustStoreAlgorithm);
trustFactory.init(truststore);
SSLContext sslcontext = SSLContext.getInstance("TLS");
sslcontext.init(null, trustFactory.getTrustManagers(), null);
- SSLSocketFactory factory = new SSLSocketFactory(sslcontext, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
- SchemeRegistry registry = new SchemeRegistry();
- final Scheme scheme = new Scheme("https4", 443, factory);
- registry.register(scheme);
- ConnectionSocketFactory plainsf = PlainConnectionSocketFactory.getSocketFactory();
- HttpComponent http4 = camelContext.getComponent("https4", HttpComponent.class);
- http4.setHttpClientConfigurer(new HttpClientConfigurer() {
-
- @Override
- public void configureHttpClient(HttpClientBuilder builder) {
- builder.setSSLSocketFactory(factory);
- Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
- .register("https", factory).register("http", plainsf).build();
- builder.setConnectionManager(new BasicHttpClientConnectionManager(registry));
- }
+ camelContext.getComponent(HTTPS, HttpComponent.class).setHttpClientConfigurer(builder -> {
+ SSLSocketFactory factory = new SSLSocketFactory(sslcontext,
+ SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+ builder.setSSLSocketFactory(factory);
+ builder.setConnectionManager(new BasicHttpClientConnectionManager(
+ RegistryBuilder.<ConnectionSocketFactory>create().register(HTTPS, factory).build()))
+ .setDefaultRequestConfig(requestConfig);
});
}
+ camelContext.getComponent(HTTP, HttpComponent.class).setHttpClientConfigurer(builder -> {
+ Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+ .register(HTTP, PlainConnectionSocketFactory.getSocketFactory()).build();
+ builder.setConnectionManager(new BasicHttpClientConnectionManager(registry))
+ .setDefaultRequestConfig(requestConfig);
+ });
}
@Override
public void configure()
- throws KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+ throws KeyManagementException, KeyStoreException, NoSuchAlgorithmException, CertificateException,
+ IOException {
restConfiguration().component("servlet").bindingMode(RestBindingMode.json).jsonDataFormat("clamp-gson")
- .dataFormatProperty("prettyPrint", "true")// .enableCORS(true)
- // turn on swagger api-doc
- .apiContextPath("api-doc").apiVendorExtension(true).apiProperty("api.title", "Clamp Rest API")
- .apiProperty("api.version", ClampVersioning.getCldsVersionFromProps())
- .apiProperty("base.path", "/restservices/clds/");
-
- // camelContext.setTracing(true);
+ .dataFormatProperty("prettyPrint", "true")// .enableCORS(true)
+ // turn on swagger api-doc
+ .apiContextPath("api-doc").apiVendorExtension(true).apiProperty("api.title", "Clamp Rest API")
+ .apiProperty("api.version", ClampVersioning.getCldsVersionFromProps())
+ .apiProperty("base.path", "/restservices/clds/");
+ // Configure httpClient properties for Camel HTTP/HTTPS calls
configureDefaultSslProperties();
- registerTrustStore();
+ configureCamelHttpComponent();
}
}
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
private static final String EMPTY_MESSAGE = "";
/** Logger delegate. */
- private Logger mlogger;
+ private final Logger mlogger;
/** Automatic UUID, overrideable per adapter or per invocation. */
- private static UUID sInstanceUUID = UUID.randomUUID();
+ private static final UUID sInstanceUUID = UUID.randomUUID();
/**
* Constructor.
* ============LICENSE_START=======================================================
* ONAP CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.onap.policy.clamp.clds.util.JsonUtils;
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* @return the Right Url modified if needed
*/
public static String getStatusUrl(DcaeOperationStatusResponse dcaeResponse) {
- return dcaeResponse.getLinks().getStatus().replaceAll("http:", "http4:").replaceAll("https:", "https4:");
+ return dcaeResponse.getLinks().getStatus();
}
/**
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights
* reserved.
* @return A yaml containing all policy Types and all data types
*/
public String downloadAllPolicyModels() {
- return callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-policy-models",
- "Get all policies models");
+ return callCamelRoute(
+ ExchangeBuilder.anExchange(camelContext).withProperty("raiseHttpExceptionFlag", true).build(),
+ "direct:get-all-policy-models", "Get all policies models");
}
/**
Yaml yamlParser = new Yaml(options);
String responseBody = callCamelRoute(
ExchangeBuilder.anExchange(camelContext).withProperty("policyModelType", policyType)
- .withProperty("policyModelVersion", policyVersion).build(), "direct:get-policy-tosca-model",
+ .withProperty("policyModelVersion", policyVersion).withProperty("raiseHttpExceptionFlag", true)
+ .build(), "direct:get-policy-tosca-model",
"Get one policy");
if (responseBody == null || responseBody.isEmpty()) {
*/
public void downloadPdpGroups() {
String responseBody =
- callCamelRoute(ExchangeBuilder.anExchange(camelContext).build(), "direct:get-all-pdp-groups",
- "Get Pdp Groups");
+ callCamelRoute(
+ ExchangeBuilder.anExchange(camelContext).withProperty("raiseHttpExceptionFlag", true).build(),
+ "direct:get-all-pdp-groups", "Get Pdp Groups");
if (responseBody == null || responseBody.isEmpty()) {
logger.warn("getPdpGroups returned by policy engine could not be decoded, as it's null or empty");
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
-# Copyright (C) 2017-2019,2021 AT&T Intellectual Property. All rights
+# Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights
# reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://localhost:8085
+clamp.config.policy.api.url=http://localhost:8085
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://localhost:8085
+clamp.config.policy.pap.url=http://localhost:8085
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = /tmp/sdc-controllers
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://localhost:8085
+clamp.config.dcae.inventory.url=http://localhost:8085
clamp.config.dcae.intentory.retry.interval=10000
clamp.config.dcae.intentory.retry.limit=5
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://localhost:8085
+clamp.config.dcae.deployment.url=http://localhost:8085
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
clamp.config.tosca.converter.dictionary.support.enabled=true
# Configuration settings for CDS
-clamp.config.cds.url=http4://cds-blueprints-processor-http:8080
+clamp.config.cds.url=http://cds-blueprints-processor-http:8080
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
\ No newline at end of file
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
# Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights
# reserved.
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://policy.api.simpledemo.onap.org:6969
+clamp.config.policy.api.url=http://policy.api.simpledemo.onap.org:6969
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://policy.api.simpledemo.onap.org:6969
+clamp.config.policy.pap.url=http://policy.api.simpledemo.onap.org:6969
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder=/tmp/sdc-controllers
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://dcae.api.simpledemo.onap.org:8080
+clamp.config.dcae.inventory.url=http://dcae.api.simpledemo.onap.org:8080
clamp.config.dcae.intentory.retry.interval=10000
clamp.config.dcae.intentory.retry.limit=5
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://dcae.api.simpledemo.onap.org:8188
+clamp.config.dcae.deployment.url=http://dcae.api.simpledemo.onap.org:8188
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
clamp.config.tosca.converter.dictionary.support.enabled=true
# Configuration settings for CDS
-clamp.config.cds.url=http4://cds-blueprints-processor-http:8080
+clamp.config.cds.url=http://cds-blueprints-processor-http:8080
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
\ No newline at end of file
<log loggingLevel="ERROR"
message="GET All Loop names FAILED: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<log loggingLevel="ERROR"
message="GET Loop request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setHeader headerName="GlobalPropertiesJson">
+ <setHeader name="GlobalPropertiesJson">
<simple>${body}</simple>
</setHeader>
<to uri="direct:load-loop"/>
<log loggingLevel="ERROR"
message="UPDATE Global properties FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setHeader headerName="OperationalPoliciesArray">
+ <setHeader name="OperationalPoliciesArray">
<simple>${body}</simple>
</setHeader>
<to uri="direct:load-loop"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE Operational policies request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
- <setProperty propertyName="MicroServicePolicyObject">
+ <setProperty name="MicroServicePolicyObject">
<simple>${body}</simple>
</setProperty>
message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UPDATE MicroService policy request FAILED, Error reported: ${exception.message}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="DCAE DEPLOY request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE DEPLOY request')"/>
<to
<to uri="direct:load-loop"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DCAE DEPLOY request','INFO',${exchangeProperty[loopObject]})"/>
-
<to uri="direct:deploy-loop"/>
<log loggingLevel="INFO"
message="DEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REFRESH Json schema request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="DCAE UNDEPLOY request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DCAE UNDEPLOY request')"/>
<to
message="UNDEPLOY request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('UNDEPLOY request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="STOP request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
message="STOP request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="RESTART request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
- <simple resultType="java.lang.Boolean">true</simple>
- </setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*,'RESTART request')"/>
<to
message="RESTART request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('RESTART request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="POLICY SUBMIT request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
<to uri="direct:load-loop"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('POLICY SUBMIT request','INFO',${exchangeProperty[loopObject]})"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:remove-all-policy-from-active-pdp-group"/>
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Processing Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Processing Operational Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<doTry>
<log loggingLevel="INFO"
message="DELETE request for loop: ${header.loopName}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<to
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Deleting Micro Service Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${body}</simple>
</setProperty>
<log loggingLevel="INFO"
message="Deleting Operational Policy: ${exchangeProperty[policy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<setBody>
<simple>${exchangeProperty[loopObject]}</simple>
</setBody>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>200</constant>
</setHeader>
</doFinally>
message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')"/>
<to uri="direct:load-loop"/>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${header.policyName}</simple>
</setProperty>
- <setProperty propertyName="policy">
+ <setProperty name="policy">
<simple>${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:remove-one-policy-from-active-pdp-group"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:delete-policy-from-loop-object"/>
message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('REMOVE OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('CREATE Loop from template request failed','ERROR',${exchangeProperty[loopObject]})"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET ALL templates request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Template request failed for template: ${header.templateName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET All Template names request failed for template: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Dictionary request failed for: ${header.dictionaryName}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="DictionaryObject">
+ <setProperty name="DictionaryObject">
<simple>${body}</simple>
</setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PUT Dictionary request failed for: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="DictionaryObject">
+ <setProperty name="DictionaryObject">
<simple>${body}</simple>
</setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PUT Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Dictionary request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Dictionary element request failed for: ${header.name}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Models request failed for: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Model request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policy Model YAML request failed for type: ${header.policyModelType}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="PolicyModelTosca">
+ <setProperty name="PolicyModelTosca">
<simple>${body}</simple>
</setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="POST Policy Model YAML request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'tosca','','update')"/>
- <setProperty propertyName="PolicyModelTosca">
+ <setProperty name="PolicyModelTosca">
<simple>${body}</simple>
</setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="MODIFY Policy Model YAML request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Policies List ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','read')"/>
-
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:get-all-policies"/>
- <setProperty propertyName="policiesListResponse">
+ <setProperty name="policiesListResponse">
<simple>${body}</simple>
</setProperty>
<to uri="direct:get-all-pdp-groups"/>
- <setProperty propertyName="pdpGroupInfoResponse">
+ <setProperty name="pdpGroupInfoResponse">
<simple>${body}</simple>
</setProperty>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="GET Policies list JSON request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'CREATE a new Policy ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
+ <setProperty name="policyModelType">
<simple>${header.policyModelType}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${header.policyModelVersion}</simple>
</setProperty>
- <setProperty propertyName="policyProperties">
+ <setProperty name="policyProperties">
<simple>${body}</simple>
</setProperty>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="CREATE Policy request failed for type: ${header.policyModelType}/${header.policyModelVersion}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DELETE a Policy ')"/>
<to
uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'policies','','update')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
+ <setProperty name="policyModelType">
<simple>${header.policyModelType}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${header.policyModelVersion}</simple>
</setProperty>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${header.policyName}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>${header.policyVersion}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:undeploy-one-policy-from-pap"/>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="DELETE Policy request failed for policy: ${header.policyName}/${header.policyVersion}, ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
</setBody>
<log loggingLevel="INFO"
message="PDP Group DEPLOY request payload: ${body}"/>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">false</simple>
+ </setProperty>
<to uri="direct:add-multiple-policies-to-pdp-group"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/>
<log loggingLevel="ERROR"
message="PDP Group deployment request failed: ${exception.stacktrace}"/>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>500</constant>
</setHeader>
<setBody>
</setBody>
<when>
<simple> ${body} == 'NOT-OK'</simple>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>404</constant>
</setHeader>
<log loggingLevel="ERROR" message="HealthCheck failed" />
message="Getting blueprint workflow list from CDS"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting workflow list from CDS')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query workflows from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}"></log>
- <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/>
+ <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflows/blueprint-name/${exchangeProperty[blueprintName]}/version/${exchangeProperty[blueprintVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doCatch>
<exception>java.lang.Exception</exception>
message="Getting blueprint input properties for workflow"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('CDS', 'Getting input properties for workflow')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query input properties for workflow from CDS : {{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec"></log>
- <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/>
+ <toD uri="{{clamp.config.cds.url}}/api/v1/blueprint-model/workflow-spec?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.cds.userName}}&authPassword={{clamp.config.cds.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doCatch>
<exception>java.lang.Exception</exception>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:deploy-loop-single-blueprint"/>
</when>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:deploy-loop-multi-blueprint"/>
</when>
</choice>
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
<log
loggingLevel="INFO"
message="Processing Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<setBody>
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getDeployPayload(${exchangeProperty[loopObject]},${exchangeProperty[microServicePolicy]})"/>
</setBody>
- <setProperty propertyName="dcaeDeploymentId">
+ <setProperty name="dcaeDeploymentId">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="generateDeploymentId()"/>
</setProperty>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>PUT</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DEPLOY micro service failed
(MicroService name:${exchangeProperty[microServicePolicy].getName()}),
Dep-id:${exchangeProperty[dcaeDeploymentId]},
StatusUrl:${exchangeProperty[dcaeStatusUrl]})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getDeployPayload(${exchangeProperty[loopObject]})"/>
</setBody>
- <setProperty propertyName="dcaeDeploymentId">
+ <setProperty name="dcaeDeploymentId">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="generateDeploymentId()"/>
</setProperty>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>PUT</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DEPLOY loop status
(Dep-id:${exchangeProperty[dcaeDeploymentId]},
StatusUrl:${exchangeProperty[dcaeStatusUrl]})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:undeploy-loop-single-blueprint"/>
</when>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false
</simple>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:undeploy-loop-multi-blueprint"/>
</when>
</choice>
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
<log
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getUndeployPayload(${exchangeProperty[microServicePolicy]})"/>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/>
</when>
<otherwise>
- <log loggingLevel="WARNING"
+ <log loggingLevel="WARN"
message="Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Cannot Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()}, the Deployment ID does not exist !','WARNING','DCAE',${exchangeProperty[loopObject]})"/>
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>UNDEPLOY micro service failed
(MicroService name:${exchangeProperty[microServicePolicy].getName()})
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/>
<choice>
<when>
- <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()}
- != null
- </simple>
+ <simple>${exchangeProperty[loopObject].getDcaeDeploymentId()} != null</simple>
<doTry>
<setBody>
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getUndeployPayload(${exchangeProperty[loopObject]})"/>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}"></log>
<toD
- uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})"/>
</setProperty>
- <setProperty propertyName="dcaeStatusUrl">
+ <setProperty name="dcaeStatusUrl">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="getStatusUrl(${exchangeProperty[dcaeResponse]})"/>
</setProperty>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>UNDEPLOY loop status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
</doTry>
</when>
<otherwise>
- <log loggingLevel="WARNING"
+ <log loggingLevel="WARN"
message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !"/>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<when>
<simple>${exchangeProperty[getStatusUrl].contains("?")} == true
</simple>
- <setProperty propertyName="uriSeparator">
+ <setProperty name="uriSeparator">
<simple>&</simple>
</setProperty>
</when>
<otherwise>
- <setProperty propertyName="uriSeparator">
+ <setProperty name="uriSeparator">
<simple>?</simple>
</setProperty>
</otherwise>
</choice>
<toD
- uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>DCAE deployment status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>DCAE</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
<toD
- uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&asdcServiceId=${exchangeProperty[blueprintServiceId]}&typeName=${exchangeProperty[blueprintName]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&asdcServiceId=${exchangeProperty[blueprintServiceId]}&typeName=${exchangeProperty[blueprintName]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
message="Getting all DCAE blueprint from inventory"/>
<to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting all blueprint from inventory')"/>
<doTry>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to query Blueprints from DCAE inventory: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
- <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true"/>
+ <toD uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types;bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
- <setProperty propertyName="dcaeResponseList">
+ <setProperty name="dcaeResponseList">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertToDcaeInventoryResponse(${body})"/>
</setProperty>
<split>
<simple>${exchangeProperty[dcaeResponseList]}</simple>
<convertBodyTo type="org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse"/>
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<simple>${body}</simple>
</setProperty>
<to uri="bean:org.onap.policy.clamp.clds.model.dcae.DcaeInventoryCache?method=addDcaeInventoryResponse(${exchangeProperty[dcaeResponse]})"/>
<setBody>
<simple>${header.loopName}</simple>
</setBody>
- <setProperty propertyName="loopObject">
+ <setProperty name="loopObject">
<method ref="org.onap.policy.clamp.loop.LoopService" method="getLoop" />
</setProperty>
<when>
<simple>${exchangeProperty[loopObject]} == null</simple>
- <setHeader headerName="CamelHttpResponseCode">
+ <setHeader name="CamelHttpResponseCode">
<constant>404</constant>
</setHeader>
<log loggingLevel="WARN" message="Loop not found in database: ${body}" />
</route>
<route id="update-policy-status-for-loop">
<from uri="direct:update-policy-status-for-loop" />
- <setProperty propertyName="policyComponent">
+ <setProperty name="policyComponent">
<simple>${exchangeProperty[loopObject].getComponent('POLICY')}
</simple>
</setProperty>
- <setProperty propertyName="policyFound">
+ <setProperty name="policyFound">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
- <setProperty propertyName="policyDeployed">
+ <setProperty name="policyDeployed">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
<log loggingLevel="INFO"
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${body.getName()}</simple>
</setProperty>
- <setProperty propertyName="policyType">
+ <setProperty name="policyType">
<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyTypeVersion">
+ <setProperty name="policyTypeVersion">
<simple>${body.getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyPdpGroup">
+ <setProperty name="policyPdpGroup">
<simple>${body.getPdpGroup()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<setBody>
<split>
<simple>${exchangeProperty[loopObject].getOperationalPolicies()}
</simple>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${body.getName()}</simple>
</setProperty>
- <setProperty propertyName="policyType">
+ <setProperty name="policyType">
<simple>${body.getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyTypeVersion">
+ <setProperty name="policyTypeVersion">
<simple>${body.getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
- <setProperty propertyName="policyPdpGroup">
+ <setProperty name="policyPdpGroup">
<simple>${body.getPdpGroup()}</simple>
</setProperty>
<setBody>
message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" />
<to uri="direct:verify-one-policy" />
</split>
- <setProperty propertyName="policyState">
+ <setProperty name="policyState">
<simple> ${exchangeProperty[policyComponent].getState()}
</simple>
</setProperty>
<when>
<simple>${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true
</simple>
- <setProperty propertyName="dcaeComponent">
+ <setProperty name="dcaeComponent">
<simple>${exchangeProperty[loopObject].getComponent('DCAE')}</simple>
</setProperty>
<when>
<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} != null
</simple>
- <setProperty propertyName="getStatusUrl">
+ <setProperty name="getStatusUrl">
<simple>${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-dcae-deployment-status" />
<when>
<simple> ${header.CamelHttpResponseCode} == 200 </simple>
<convertBodyTo type="java.lang.String" />
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})" />
</setProperty>
</when>
</when>
- <setProperty propertyName="dcaeState">
+ <setProperty name="dcaeState">
<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
</simple>
</setProperty>
<split>
<simple>${exchangeProperty[loopObject].getMicroServicePolicies()}
</simple>
- <setProperty propertyName="microServicePolicy">
+ <setProperty name="microServicePolicy">
<simple>${body}</simple>
</setProperty>
- <setProperty propertyName="dcaeComponent">
+ <setProperty name="dcaeComponent">
<simple>${exchangeProperty[loopObject].getComponent('DCAE_' + ${exchangeProperty[microServicePolicy].getName()})}</simple>
</setProperty>
<when>
<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} != null
</simple>
- <setProperty propertyName="getStatusUrl">
+ <setProperty name="getStatusUrl">
<simple>${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()}</simple>
</setProperty>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-dcae-deployment-status" />
<when>
<simple> ${header.CamelHttpResponseCode} == 200 </simple>
<convertBodyTo type="java.lang.String" />
- <setProperty propertyName="dcaeResponse">
+ <setProperty name="dcaeResponse">
<method ref="org.onap.policy.clamp.loop.components.external.DcaeComponent"
method="convertDcaeResponse(${body})" />
</setProperty>
</when>
</when>
- <setProperty propertyName="dcaeState">
+ <setProperty name="dcaeState">
<simple> ${exchangeProperty[dcaeComponent].computeState(*)}
</simple>
</setProperty>
<choice>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'BLUEPRINT_DEPLOYED' and ${exchangeProperty['policyState'].getStateName()}
+ 'BLUEPRINT_DEPLOYED' && ${exchangeProperty['policyState'].getStateName()}
== 'NOT_SENT'
</simple>
<to
uri="bean:org.onap.policy.clamp.loop.LoopService?method=updateLoopState(${exchangeProperty[loopObject]},'DESIGN')" />
</when>
<when>
- <simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' or
+ <simple>${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' ||
${exchangeProperty['dcaeState'].getStateName()} ==
'MICROSERVICE_INSTALLATION_FAILED'
</simple>
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_UNINSTALLATION_FAILED' or
+ 'MICROSERVICE_UNINSTALLATION_FAILED' ||
${exchangeProperty['policyState'].getStateName()} == 'IN_ERROR'
</simple>
<to
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &&
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &&
${exchangeProperty['policyState'].getStateName()} == 'SENT'
</simple>
<to
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'BLUEPRINT_DEPLOYED' or ${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' and
+ 'BLUEPRINT_DEPLOYED' || ${exchangeProperty['dcaeState'].getStateName()} ==
+ 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' &&
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'PROCESSING_MICROSERVICE_INSTALLATION' or
+ 'PROCESSING_MICROSERVICE_INSTALLATION' ||
${exchangeProperty['dcaeState'].getStateName()} ==
- 'PROCESSING_MICROSERVICE_UNINSTALLATION' and
+ 'PROCESSING_MICROSERVICE_UNINSTALLATION' &&
${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED'
</simple>
<to
</when>
<when>
<simple>${exchangeProperty['dcaeState'].getStateName()} ==
- 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and
+ 'MICROSERVICE_INSTALLED_SUCCESSFULLY' &&
${exchangeProperty['policyState'].getStateName()} != 'NOT_SENT'
</simple>
<to
<routes xmlns="http://camel.apache.org/schema/spring">
<route id="verify-one-policy">
<from uri="direct:verify-one-policy"/>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-policy"/>
<when>
<simple>${header.CamelHttpResponseCode} != 200</simple>
- <setProperty propertyName="policyFound">
+ <setProperty name="policyFound">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<log loggingLevel="WARN"
message="At least one policy has not been found on policy engine: ${exchangeProperty[policyName]}"/>
</when>
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<to uri="direct:get-deployment-policy"/>
<when>
<simple>${header.CamelHttpResponseCode} != 200</simple>
- <setProperty propertyName="policyDeployed">
+ <setProperty name="policyDeployed">
<simple resultType="java.lang.Boolean">false</simple>
</setProperty>
<log loggingLevel="WARN"
message="At least one policy has not been deployed on policy engine: ${exchangeProperty[policyName]}"/>
</when>
- <setProperty propertyName="newPolicyState">
+ <setProperty name="newPolicyState">
<simple>${exchangeProperty[policyComponent].computeState(*)}</simple>
</setProperty>
</route>
message="Getting Policy: ${exchangeProperty[policyName]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} GET
Policy status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy deployment status: {{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doCatch>
<exception>java.lang.Exception</exception>
<handled>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} GET Policy deployment
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<simple>${exchangeProperty[policy].createPolicyPayload()}
</simple>
</setBody>
- <setProperty propertyName="policyModelType">
+ <setProperty name="policyModelType">
<simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
</setProperty>
<to uri="direct:create-policy"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policy].getName()} creation
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
message="Deleting Policy in a loop: ${exchangeProperty[policy].getName()}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Policy in a loop')"/>
- <setProperty propertyName="policyModelType">
+ <setProperty name="policyModelType">
<simple>${exchangeProperty[policy].getPolicyModel().getPolicyModelType()}</simple>
</setProperty>
- <setProperty propertyName="policyModelVersion">
+ <setProperty name="policyModelVersion">
<simple>${exchangeProperty[policy].getPolicyModel().getVersion()}</simple>
</setProperty>
- <setProperty propertyName="policyName">
+ <setProperty name="policyName">
<simple>${exchangeProperty[policy].getName()}</simple>
</setProperty>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<to uri="direct:delete-policy"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policy].getName()} removal
status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")}
</simple>
</setBody>
+ <setProperty name="raiseHttpExceptionFlag">
+ <simple resultType="java.lang.Boolean">true</simple>
+ </setProperty>
<to uri="direct:add-multiple-policies-to-pdp-group"/>
<doFinally>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group push ALL status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")}
</simple>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to remove policies from PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group remove ALL status</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing one policy PDP group')"/>
- <setProperty propertyName="policyVersion">
+ <setProperty name="policyVersion">
<simple>1.0.0</simple>
</setProperty>
<to uri="direct:undeploy-one-policy-from-pap"/>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>${exchangeProperty[policyName]} PDP Group removal status
</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<handled>
<constant>false</constant>
</handled>
- <setProperty propertyName="logMessage">
+ <setProperty name="logMessage">
<simple>PDP Group removal, Error reported: ${exception}</simple>
</setProperty>
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<simple>POLICY</simple>
</setProperty>
<to uri="direct:dump-loop-log-http-response"/>
<log loggingLevel="INFO" message="Getting all the policy models"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting all the policy models')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get all policy models: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
message="Getting the policy tosca model: ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy model')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy model: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
message="Getting the list of PDP Groups"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the PDP Group list')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policy model: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
message="Getting the policies list"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policies list')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>GET</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to get policies list: {{clamp.config.policy.api.url}}/policy/api/v1/policies"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<convertBodyTo type="java.lang.String"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
message="Add policies to PDP group"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
<setBody>
<constant>null</constant>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
message="Create Policy from model ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/>
<to
uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Policy')"/>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>POST</constant>
</setHeader>
- <setHeader headerName="Content-Type">
+ <setHeader name="Content-Type">
<constant>application/json</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to create policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<to
<setBody>
<constant>null</constant>
</setBody>
- <setHeader headerName="CamelHttpMethod">
+ <setHeader name="CamelHttpMethod">
<constant>DELETE</constant>
</setHeader>
- <setHeader headerName="X-ONAP-RequestID">
+ <setHeader name="X-ONAP-RequestID">
<simple>${exchangeProperty[X-ONAP-RequestID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-InvocationID">
+ <setHeader name="X-ONAP-InvocationID">
<simple>${exchangeProperty[X-ONAP-InvocationID]}
</simple>
</setHeader>
- <setHeader headerName="X-ONAP-PartnerName">
+ <setHeader name="X-ONAP-PartnerName">
<simple>${exchangeProperty[X-ONAP-PartnerName]}
</simple>
</setHeader>
<log loggingLevel="INFO"
message="Endpoint to delete policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}"></log>
<toD
- uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true"/>
+ uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/>
<doFinally>
<to uri="direct:reset-raise-http-exception-flag"/>
<routes xmlns="http://camel.apache.org/schema/spring">
<route id="reset-raise-http-exception-flag">
<from uri="direct:reset-raise-http-exception-flag" />
- <setProperty propertyName="raiseHttpExceptionFlag">
+ <setProperty name="raiseHttpExceptionFlag">
<simple resultType="java.lang.Boolean">true</simple>
</setProperty>
</route>
<otherwise>
<to
uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" />
- <setProperty propertyName="logComponent">
+ <setProperty name="logComponent">
<constant>null</constant>
</setProperty>
</otherwise>
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
* Copyright (C) 2019 Samsung. All rights reserved.
* ================================================================================
+ * Modifications Copyright (c) 2021 AT&T
+ * ================================================================================
* 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
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.support.DefaultExchange;
import org.junit.Test;
import org.mockito.Mockito;
import org.onap.policy.clamp.clds.util.LoggingUtils;
private FlowLogOperation flowLogOperation = new FlowLogOperation();
@Test
- public void testStratLog() {
+ public void testStartLog() {
// given
LoggingUtils loggingUtils = mock(LoggingUtils.class);
ReflectionTestUtils.setField(flowLogOperation, "util", loggingUtils);
public void testInvokeLog() {
// given
final String mockEntity = "mockEntity";
- final String mockServiceName = "mockSerivceName";
+ final String mockServiceName = "mockServiceName";
MDCAdapter mdcAdapter = MDC.getMDCAdapter();
// when
flowLogOperation.invokeLog(mockEntity, mockServiceName);
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Modifications copyright (c) 2019 Nokia
@Qualifier("csarInstaller")
private CsarInstaller csarInstaller;
- private BlueprintArtifact buildFakeBuildprintArtifact(String instanceName, String invariantResourceUuid,
- String blueprintFilePath, String artifactName,
- String invariantServiceUuid) throws IOException {
+ private BlueprintArtifact buildFakeBlueprintArtifact(String instanceName, String invariantResourceUuid,
+ String blueprintFilePath, String artifactName,
+ String invariantServiceUuid) throws IOException {
IResourceInstance resource = Mockito.mock(IResourceInstance.class);
Mockito.when(resource.getResourceInstanceName()).thenReturn(instanceName);
Mockito.when(resource.getResourceInvariantUUID()).thenReturn(invariantResourceUuid);
Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
// Create fake blueprint artifact 1 on resource1
- BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
+ BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca-bad-policy.yaml", "tca-bad-policy.yaml",
INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
// Create fake blueprint artifact 1 on resource1
- BlueprintArtifact blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
+ BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca.yaml", "tca.yaml", INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 2 on resource2
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE2, INVARIANT_RESOURCE2_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE2, INVARIANT_RESOURCE2_UUID,
"example/sdc/blueprint-dcae/tca_2.yaml", "tca_2.yaml", INVARIANT_SERVICE_UUID);
listResources.add(blueprintArtifact.getResourceAttached());
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 3 on resource 1 so that it's possible to
// test multiple CL deployment per Service/vnf
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
"example/sdc/blueprint-dcae/tca_3.yaml", "tca_3.yaml", INVARIANT_SERVICE_UUID);
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
// Create fake blueprint artifact 3 on resource 1 so that it's possible to
// test multiple CL deployment per Service/vnf
- blueprintArtifact = buildFakeBuildprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
+ blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
"example/sdc/blueprint-dcae/tca-guilin.yaml", "tca-guilin.yaml", INVARIANT_SERVICE_UUID);
blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
/*-
* ============LICENSE_START=======================================================
- * ONAP CLAMP
+ * ONAP POLICY-CLAMP
* ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import org.mockito.Mockito;
import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
+import org.onap.policy.clamp.clds.util.ResourceFileUtils;
import org.onap.policy.clamp.loop.components.external.DcaeComponent;
import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
import org.onap.policy.clamp.loop.template.LoopTemplate;
JsonObject.class));
loopTest.setLastComputedState(LoopState.DESIGN);
loopTest.setDcaeDeploymentId("123456789");
- loopTest.setDcaeDeploymentStatusUrl("http4://localhost:8085");
+ loopTest.setDcaeDeploymentStatusUrl("http://localhost:8085");
MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", new PolicyModel("policy1",
"tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0"), true,
*/
@Test
public void convertToDcaeInventoryResponseTest() throws IOException, ParseException {
- String dcaeFakeResponse = "{\n" + " \"links\": {\n" + " \"previousLink\": {\n"
- + " \"title\": \"string\",\n" + " \"rel\": \"string\",\n" + " \"uri\": \"string\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " },\n" + " \"nextLink\": {\n"
- + " \"title\": \"string\",\n" + " \"rel\": \"string\",\n" + " \"uri\": \"string\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " }\n" + " },\n" + " \"totalCount\": 0,\n"
- + " \"items\": [\n" + " {\n" + " \"owner\": \"testOwner\",\n"
- + " \"application\": \"testApplication\",\n" + " \"component\": \"testComponent\",\n"
- + " \"typeName\": \"testTypeName\",\n" + " \"typeVersion\": 0,\n"
- + " \"blueprintTemplate\": \"testBlueprintTemplate\",\n" + " \"serviceIds\": [\n"
- + " \"serviceId1\", \"serviceId2\"\n" + " ],\n" + " \"vnfTypes\": [\n"
- + " \"vnfType1\", \"vnfType2\"\n" + " ],\n" + " \"serviceLocations\": [\n"
- + " \"serviceLocation1\", \"serviceLocation2\"\n" + " ],\n"
- + " \"asdcServiceId\": \"testAsdcServiceId\",\n"
- + " \"asdcResourceId\": \"testAsdcResourceId\",\n"
- + " \"asdcServiceURL\": \"testAsdcServiceURL\",\n" + " \"typeId\": \"testTypeId\",\n"
- + " \"selfLink\": {\n" + " \"title\": \"selfLinkTitle\",\n"
- + " \"rel\": \"selfLinkRel\",\n" + " \"uri\": \"selfLinkUri\",\n"
- + " \"uriBuilder\": {},\n" + " \"rels\": [\n" + " \"string\"\n" + " ],\n"
- + " \"params\": {\n" + " \"additionalProp1\": \"string\",\n"
- + " \"additionalProp2\": \"string\",\n" + " \"additionalProp3\": \"string\"\n"
- + " },\n" + " \"type\": \"string\"\n" + " },\n"
- + " \"created\": \"2020-01-22T09:38:15.436Z\",\n"
- + " \"deactivated\": \"2020-01-22T09:38:15.437Z\"\n" + " }\n" + " ]\n" + "}";
- List<DcaeInventoryResponse> responseObject = DcaeComponent.convertToDcaeInventoryResponse(dcaeFakeResponse);
+
+ List<DcaeInventoryResponse> responseObject = DcaeComponent
+ .convertToDcaeInventoryResponse(
+ ResourceFileUtils.getResourceAsString("example/dcae/inventory-response.json"));
assertThat(responseObject.get(0).getAsdcResourceId()).isEqualTo("testAsdcResourceId");
assertThat(responseObject.get(0).getAsdcServiceId()).isEqualTo("testAsdcServiceId");
assertThat(responseObject.get(0).getTypeName()).isEqualTo("testTypeName");
saveTestLoopToDb();
Loop loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
loopService.updateDcaeDeploymentFields(loop, "CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85",
- "https4://deployment-handler.onap:8443");
+ "https://deployment-handler.onap:8443");
loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
assertThat(loop.getDcaeDeploymentId()).isEqualTo("CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85");
- assertThat(loop.getDcaeDeploymentStatusUrl()).isEqualTo("https4://deployment-handler.onap:8443");
+ assertThat(loop.getDcaeDeploymentStatusUrl()).isEqualTo("https://deployment-handler.onap:8443");
}
@Test
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
# reserved.
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.intentory.retry.interval=100
clamp.config.dcae.intentory.retry.limit=1
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
# Configuration settings for CDS
-clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
--- /dev/null
+{
+ "links": {
+ "previousLink": {
+ "title": "string",
+ "rel": "string",
+ "uri": "string",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ },
+ "nextLink": {
+ "title": "string",
+ "rel": "string",
+ "uri": "string",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ }
+ },
+ "totalCount": 0,
+ "items": [
+ {
+ "owner": "testOwner",
+ "application": "testApplication",
+ "component": "testComponent",
+ "typeName": "testTypeName",
+ "typeVersion": 0,
+ "blueprintTemplate": "testBlueprintTemplate",
+ "serviceIds": [
+ "serviceId1",
+ "serviceId2"
+ ],
+ "vnfTypes": [
+ "vnfType1",
+ "vnfType2"
+ ],
+ "serviceLocations": [
+ "serviceLocation1",
+ "serviceLocation2"
+ ],
+ "asdcServiceId": "testAsdcServiceId",
+ "asdcResourceId": "testAsdcResourceId",
+ "asdcServiceURL": "testAsdcServiceURL",
+ "typeId": "testTypeId",
+ "selfLink": {
+ "title": "selfLinkTitle",
+ "rel": "selfLinkRel",
+ "uri": "selfLinkUri",
+ "uriBuilder": {},
+ "rels": [
+ "string"
+ ],
+ "params": {
+ "additionalProp1": "string",
+ "additionalProp2": "string",
+ "additionalProp3": "string"
+ },
+ "type": "string"
+ },
+ "created": "2020-01-22T09:38:15.436Z",
+ "deactivated": "2020-01-22T09:38:15.437Z"
+ }
+ ]
+}
\ No newline at end of file
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#For EELF logback file
#com.att.eelf.logging.path=
#The log folder that will be used in logback.xml file
clamp.config.log.path=log
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
###
# ============LICENSE_START=======================================================
-# ONAP CLAMP
+# ONAP POLICY-CLAMP
# ================================================================================
# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
# reserved.
camel.defaultthreadpool.maxqueuesize=1000
camel.defaultthreadpool.keepaliveTime=60
camel.defaultthreadpool.rejectpolicy=CallerRuns
-#camel.springboot.xmlRoutes = false
-camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
-#camel.springboot.typeConversion = false
+camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
+camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
+camel.springboot.backlog-tracing=true
+camel.springboot.tracing=true
+camel.springboot.message-history=true
#clds datasource connection details
spring.datasource.driverClassName=org.mariadb.jdbc.Driver
clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
+clamp.config.httpclient.socketTimeout=20000
+clamp.config.httpclient.connectTimeout=10000
+
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.api.userName=healthcheck
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
clamp.config.policy.pap.userName=healthcheck
clamp.config.policy.pap.password=zb!XztG34
clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.intentory.retry.interval=100
clamp.config.dcae.intentory.retry.limit=1
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
# Configuration settings for CDS
-clamp.config.cds.url=http4://localhost:${docker.http-cache.port.host}
+clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
Code Review / policy / clamp.git / commitdiff