aboutsummaryrefslogtreecommitdiffstats
path: root/controlloop/common/actors
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-01-10 09:57:51 -0500
committerJim Hahn <jrh3@att.com>2019-01-10 11:12:49 -0500
commit485559b57a49a449c6fc3baeda1b0ffd8b05cf6b (patch)
tree22dfb08b040c8485f589c59d9260597f773616ab /controlloop/common/actors
parentbdc051bb70262daca12cd0c2e5fcc6bcf795996c (diff)
Remove model-impl/vfc checkstyle suppressions
Entails renaming VFCxxx classes and updated drl files, as well. Change-Id: Ib31c61a35536df22772de6090761b22beb1b561b Issue-ID: POLICY-1145 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/actors')
-rw-r--r--controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java22
-rw-r--r--controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java8
2 files changed, 15 insertions, 15 deletions
diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
index 8660aa3e2..323b54d9c 100644
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2017-2018 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,10 +34,10 @@ import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
import org.onap.policy.controlloop.policy.Policy;
import org.onap.policy.drools.system.PolicyEngine;
import org.onap.policy.rest.RESTManager;
-import org.onap.policy.vfc.VFCHealActionVmInfo;
-import org.onap.policy.vfc.VFCHealAdditionalParams;
-import org.onap.policy.vfc.VFCHealRequest;
-import org.onap.policy.vfc.VFCRequest;
+import org.onap.policy.vfc.VfcHealActionVmInfo;
+import org.onap.policy.vfc.VfcHealAdditionalParams;
+import org.onap.policy.vfc.VfcHealRequest;
+import org.onap.policy.vfc.VfcRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,11 +86,11 @@ public class VfcActorServiceProvider implements Actor {
* @param vnfResponse the VNF response
* @return the constructed request
*/
- public static VFCRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation,
+ public static VfcRequest constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation,
Policy policy, AaiGetVnfResponse vnfResponse) {
// Construct an VFC request
- VFCRequest request = new VFCRequest();
+ VfcRequest request = new VfcRequest();
String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
if (serviceInstance == null || "".equals(serviceInstance)) {
AaiGetVnfResponse tempVnfResp = vnfResponse;
@@ -103,16 +103,16 @@ public class VfcActorServiceProvider implements Actor {
}
serviceInstance = tempVnfResp.getServiceId();
}
- request.setNSInstanceId(serviceInstance);
+ request.setNsInstanceId(serviceInstance);
request.setRequestId(onset.getRequestId());
- request.setHealRequest(new VFCHealRequest());
+ request.setHealRequest(new VfcHealRequest());
request.getHealRequest().setVnfInstanceId(onset.getAai().get("generic-vnf.vnf-id"));
request.getHealRequest().setCause(operation.getMessage());
- request.getHealRequest().setAdditionalParams(new VFCHealAdditionalParams());
+ request.getHealRequest().setAdditionalParams(new VfcHealAdditionalParams());
if (policy.getRecipe().toLowerCase().equalsIgnoreCase(RECIPE_RESTART)) {
request.getHealRequest().getAdditionalParams().setAction("restartvm");
- request.getHealRequest().getAdditionalParams().setActionInfo(new VFCHealActionVmInfo());
+ request.getHealRequest().getAdditionalParams().setActionInfo(new VfcHealActionVmInfo());
request.getHealRequest().getAdditionalParams().getActionInfo()
.setVmid(onset.getAai().get("vserver.vserver-id"));
request.getHealRequest().getAdditionalParams().getActionInfo()
diff --git a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java
index 02387b641..9e6b5b827 100644
--- a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java
+++ b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java
@@ -1,9 +1,9 @@
/*-
* ============LICENSE_START=======================================================
- * TestVFCActorServiceProvider
+ * ONAP - Policy Drools Applications
* ================================================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Corp. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Corp. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import org.onap.policy.controlloop.VirtualControlLoopEvent;
import org.onap.policy.controlloop.policy.Policy;
import org.onap.policy.drools.system.PolicyEngine;
import org.onap.policy.simulators.Util;
-import org.onap.policy.vfc.VFCRequest;
+import org.onap.policy.vfc.VfcRequest;
public class VfcActorServiceProviderTest {
@@ -97,7 +97,7 @@ public class VfcActorServiceProviderTest {
policy.setRecipe("Restart");
assertNotNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
- VFCRequest request =
+ VfcRequest request =
VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse());
assertEquals(requestId, Objects.requireNonNull(request).getRequestId());