summaryrefslogtreecommitdiffstats
path: root/controlloop/common/actors/actor.vfc
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/common/actors/actor.vfc')
-rw-r--r--controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProvider.java (renamed from controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java)5
-rw-r--r--controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor2
-rw-r--r--controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/VfcActorServiceProviderTest.java22
3 files changed, 15 insertions, 14 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 b8aaf854a..8660aa3e2 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,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2017-2018 Intel Corp. All rights reserved.
+ * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,8 +41,8 @@ import org.onap.policy.vfc.VFCRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class VFCActorServiceProvider implements Actor {
- private static final Logger logger = LoggerFactory.getLogger(VFCActorServiceProvider.class);
+public class VfcActorServiceProvider implements Actor {
+ private static final Logger logger = LoggerFactory.getLogger(VfcActorServiceProvider.class);
// Strings for VFC Actor
private static final String VFC_ACTOR = "VFC";
diff --git a/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor b/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
index 1476eac1d..e43c726cf 100644
--- a/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
+++ b/controlloop/common/actors/actor.vfc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorServiceProvider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actor.vfc.VFCActorServiceProvider
+org.onap.policy.controlloop.actor.vfc.VfcActorServiceProvider
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 934ea134c..02387b641 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
@@ -68,37 +68,37 @@ public class VfcActorServiceProviderTest {
Policy policy = new Policy();
policy.setRecipe("GoToOz");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
onset.getAai().put("generic-vnf.vnf-id", "dorothy.gale.1939");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
PolicyEngine.manager.setEnvironmentProperty("aai.username", "AAI");
PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
UUID requestId = UUID.randomUUID();
onset.setRequestId(requestId);
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
onset.getAai().put("generic-vnf.vnf-name", "Dorothy");
PolicyEngine.manager.getEnvironment().remove("aai.password");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
onset.getAai().put("service-instance.service-instance-id", "");
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, null));
- assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
+ assertNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
policy.setRecipe("Restart");
- assertNotNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
+ assertNotNull(VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));
VFCRequest request =
- VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse());
+ VfcActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse());
assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
assertEquals("dorothy.gale.1939", request.getHealRequest().getVnfInstanceId());
@@ -107,7 +107,7 @@ public class VfcActorServiceProviderTest {
@Test
public void testMethods() {
- VFCActorServiceProvider sp = new VFCActorServiceProvider();
+ VfcActorServiceProvider sp = new VfcActorServiceProvider();
assertEquals("VFC", sp.actor());
assertEquals(1, sp.recipes().size());