aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop
diff options
context:
space:
mode:
authorjhh <jorge.hernandez-herrero@att.com>2019-04-14 21:41:14 -0500
committerjhh <jorge.hernandez-herrero@att.com>2019-04-14 21:41:14 -0500
commit50be587b3604c958faa438cd587364da8f49d9a7 (patch)
tree59b60775d725e841bc0a08d2ea6cf2d4f2e72e42 /controlloop
parent84286faf575e4311720829c1df101614a769a240 (diff)
Modify dependencies to avoid enabled features fail
The drl change is only partial just to recognize Tosca policies. Change-Id: I5d3b8071394a9ea14638170e04d74e4c6b4ad028 Issue-ID: POLICY-1642 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'controlloop')
-rw-r--r--controlloop/common/feature-controlloop-management/pom.xml16
-rw-r--r--controlloop/common/feature-controlloop-trans/pom.xml2
-rw-r--r--controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl17
3 files changed, 34 insertions, 1 deletions
diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index 40e37beff..84fbe485e 100644
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -87,7 +87,9 @@
<addParentPoms>false</addParentPoms>
<copyPom>false</copyPom>
<includeScope>runtime</includeScope>
+ <excludeScope>provided</excludeScope>
<excludeTransitive>false</excludeTransitive>
+ <excludeGroupIds>org.glassfish.hk2.external,org.glassfish.hk2</excludeGroupIds>
</configuration>
</execution>
</executions>
@@ -135,6 +137,16 @@
<groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
<artifactId>aai</artifactId>
<version>${policy.models.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
@@ -187,6 +199,10 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.commons</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml
index 4d9080616..915636e6b 100644
--- a/controlloop/common/feature-controlloop-trans/pom.xml
+++ b/controlloop/common/feature-controlloop-trans/pom.xml
@@ -106,7 +106,6 @@
<excludes>
</excludes>
<consoleOutput>true</consoleOutput>
- <failsOnViolation>true</failsOnViolation>
<violationSeverity>warning</violationSeverity>
</configuration>
</execution>
@@ -128,6 +127,7 @@
<groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
<artifactId>events</artifactId>
<version>${policy.models.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 77edee1e7..8dcc79866 100644
--- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -64,6 +64,7 @@ import org.onap.policy.guard.PolicyGuardRequest;
import org.onap.policy.guard.PolicyGuardResponse;
import org.onap.policy.guard.PolicyGuardXacmlRequestAttributes;
import org.onap.policy.guard.PolicyGuardXacmlHelper;
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -110,6 +111,22 @@ end
/*
*
+* Called when a Tosca Policy fact is present.
+*
+*/
+rule "NEW TOSCA POLICY"
+ when
+ $policy : ToscaPolicy()
+ then
+
+ Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
+ logger.info("{}:{}: [{}|{}|{}|{}]: CONTENT: {}", drools.getRule().getName(),
+ $policy.getType(), $policy.getTypeVersion(), $policy.getName(), $policy.getVersion(),
+ $policy);
+end
+
+/*
+*
* This rule responds to DCAE Events where there is no manager yet. Either it is
* the first ONSET, or a subsequent badly formed Event (i.e. Syntax error, or is-closed-loop-disabled)
*