From 68377161605e39c8c74ea77d0b504177480788f3 Mon Sep 17 00:00:00 2001 From: "Gao, Chenfei (cg287m)" Date: Thu, 22 Jun 2017 14:48:41 -0400 Subject: [POLICY-22] Reorganizing drools-apps Change-Id: I5f9bb3908f8d55c466dd847ae5e01a424e9ba364 Signed-off-by: Gao, Chenfei (cg287m) Signed-off-by: Pamela Dragosh --- controlloop/common/actors/actor.appc/pom.xml | 32 ++++++ .../actor/appc/APPCActorServiceProvider.java | 113 +++++++++++++++++++++ ...licy.controlloop.actorServiceProvider.spi.Actor | 1 + controlloop/common/actors/actor.mso/pom.xml | 20 ++++ .../actor/mso/MSOActorServiceProvider.java | 58 +++++++++++ ...licy.controlloop.actorServiceProvider.spi.Actor | 1 + controlloop/common/actors/actor.test/pom.xml | 41 ++++++++ .../onap/policy/controlloop/actor/test/Test.java | 46 +++++++++ .../common/actors/actorServiceProvider/pom.xml | 12 +++ .../actorServiceProvider/ActorService.java | 56 ++++++++++ .../actorServiceProvider/spi/Actor.java | 35 +++++++ controlloop/common/actors/pom.xml | 32 ++++++ 12 files changed, 447 insertions(+) create mode 100644 controlloop/common/actors/actor.appc/pom.xml create mode 100644 controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java create mode 100644 controlloop/common/actors/actor.appc/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor create mode 100644 controlloop/common/actors/actor.mso/pom.xml create mode 100644 controlloop/common/actors/actor.mso/src/main/java/org/onap/policy/controlloop/actor/mso/MSOActorServiceProvider.java create mode 100644 controlloop/common/actors/actor.mso/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor create mode 100644 controlloop/common/actors/actor.test/pom.xml create mode 100644 controlloop/common/actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/Test.java create mode 100644 controlloop/common/actors/actorServiceProvider/pom.xml create mode 100644 controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/ActorService.java create mode 100644 controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/spi/Actor.java create mode 100644 controlloop/common/actors/pom.xml (limited to 'controlloop/common/actors') diff --git a/controlloop/common/actors/actor.appc/pom.xml b/controlloop/common/actors/actor.appc/pom.xml new file mode 100644 index 000000000..5f6519a47 --- /dev/null +++ b/controlloop/common/actors/actor.appc/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + org.onap.policy.drools-applications + actors + 1.1.0-SNAPSHOT + + actor.appc + + + org.onap.policy.drools-applications + actorServiceProvider + 1.1.0-SNAPSHOT + provided + + + org.onap.policy.drools-applications + appc + 1.1.0-SNAPSHOT + provided + + + org.onap.policy.drools-applications + events + 1.1.0-SNAPSHOT + provided + + + diff --git a/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java new file mode 100644 index 000000000..fe6bf40af --- /dev/null +++ b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java @@ -0,0 +1,113 @@ +/*- + * ============LICENSE_START======================================================= + * APPCActorServiceProvider + * ================================================================================ + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop.actor.appc; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.onap.policy.controlloop.VirtualControlLoopEvent; +import org.onap.policy.appc.CommonHeader; +import org.onap.policy.appc.Request; +import org.onap.policy.controlloop.ControlLoopOperation; +import org.onap.policy.controlloop.policy.Policy; + +import org.onap.policy.controlloop.actorServiceProvider.spi.Actor; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + + +public class APPCActorServiceProvider implements Actor { + + private static final ImmutableList recipes = ImmutableList.of("Restart", "Rebuild", "Migrate", "ModifyConfig"); + private static final ImmutableMap> targets = new ImmutableMap.Builder>() + .put("Restart", ImmutableList.of("VM")) + .put("Rebuild", ImmutableList.of("VM")) + .put("Migrate", ImmutableList.of("VM")) + .put("ModifyConfig", ImmutableList.of("VFC")) + .build(); + private static final ImmutableMap> payloads = new ImmutableMap.Builder>() + .put("ModifyConfig", ImmutableList.of("generic-vnf.vnf-id")) + .build(); + + @Override + public String actor() { + return "APPC"; + } + + @Override + public List recipes() { + return ImmutableList.copyOf(recipes); + } + + @Override + public List recipeTargets(String recipe) { + return ImmutableList.copyOf(targets.getOrDefault(recipe, Collections.emptyList())); + } + + @Override + public List recipePayloads(String recipe) { + return ImmutableList.copyOf(payloads.getOrDefault(recipe, Collections.emptyList())); + } + + + public static Request constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation, Policy policy) { + // + // Construct an APPC request + // + Request request = new Request(); + request.CommonHeader = new CommonHeader(); + request.CommonHeader.RequestID = onset.requestID; + request.CommonHeader.SubRequestID = operation.subRequestId; + request.Action = policy.recipe; + + // + // TODO: do we need to take care of the target + // + + // + // Handle the payload + // + if (policy.payload != null && !policy.payload.isEmpty()) { + request.Payload = new HashMap(); + // + // Add each payload entry + // + for (Map.Entry entry : policy.payload.entrySet()) { + // + // TODO: entry key has ref$, value has {xxxx} + // + request.Payload.put(entry.getKey(), entry.getValue()); + } + } + + + request.Payload.put("AICVServerSelfLink", onset.AAI.get("vserver.selflink"));//.AICVServerSelfLink); + request.Payload.put("AICIdentity", onset.AAI.get("cloud-region.identity-url"));//AICIdentity); + // + // Return the request + // + return request; + } + + +} diff --git a/controlloop/common/actors/actor.appc/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor b/controlloop/common/actors/actor.appc/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor new file mode 100644 index 000000000..5e76150c4 --- /dev/null +++ b/controlloop/common/actors/actor.appc/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor @@ -0,0 +1 @@ +com.att.ecomp.policy.controlloop.actor.appc.APPCActorServiceProvider \ No newline at end of file diff --git a/controlloop/common/actors/actor.mso/pom.xml b/controlloop/common/actors/actor.mso/pom.xml new file mode 100644 index 000000000..f0bbf48cb --- /dev/null +++ b/controlloop/common/actors/actor.mso/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + org.onap.policy.drools-applications + actors + 1.1.0-SNAPSHOT + + actor.mso + + + org.onap.policy.drools-applications + actorServiceProvider + 1.1.0-SNAPSHOT + provided + + + diff --git a/controlloop/common/actors/actor.mso/src/main/java/org/onap/policy/controlloop/actor/mso/MSOActorServiceProvider.java b/controlloop/common/actors/actor.mso/src/main/java/org/onap/policy/controlloop/actor/mso/MSOActorServiceProvider.java new file mode 100644 index 000000000..d57e62634 --- /dev/null +++ b/controlloop/common/actors/actor.mso/src/main/java/org/onap/policy/controlloop/actor/mso/MSOActorServiceProvider.java @@ -0,0 +1,58 @@ +/*- + * ============LICENSE_START======================================================= + * MSOActorServiceProvider + * ================================================================================ + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop.actor.mso; + +import java.util.Collections; +import java.util.List; + +import org.onap.policy.controlloop.actorServiceProvider.spi.Actor; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +public class MSOActorServiceProvider implements Actor { + + private static final ImmutableList recipes = ImmutableList.of( + "VF Module Create"); + private static final ImmutableMap> targets = new ImmutableMap.Builder>() + .put("VF Module Create", ImmutableList.of("VFC")) + .build(); + + @Override + public String actor() { + return "MSO"; + } + + @Override + public List recipes() { + return ImmutableList.copyOf(recipes); + } + + @Override + public List recipeTargets(String recipe) { + return ImmutableList.copyOf(targets.getOrDefault(recipe, Collections.emptyList())); + } + + @Override + public List recipePayloads(String recipe) { + return Collections.emptyList(); + } + +} diff --git a/controlloop/common/actors/actor.mso/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor b/controlloop/common/actors/actor.mso/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor new file mode 100644 index 000000000..aeed27b3b --- /dev/null +++ b/controlloop/common/actors/actor.mso/src/main/resources/META-INF/services/com.att.ecomp.policy.controlloop.actorServiceProvider.spi.Actor @@ -0,0 +1 @@ +com.att.ecomp.policy.controlloop.actor.mso.MSOActorServiceProvider \ No newline at end of file diff --git a/controlloop/common/actors/actor.test/pom.xml b/controlloop/common/actors/actor.test/pom.xml new file mode 100644 index 000000000..9d8ffa48d --- /dev/null +++ b/controlloop/common/actors/actor.test/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.onap.policy.drools-applications + actors + 1.1.0-SNAPSHOT + + actor.test + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + ${settings.localRepository}/org/onap/policy/drools-applications/actor.appc/1.1.0-SNAPSHOT/actor.appc-1.1.0-SNAPSHOT.jar + ${settings.localRepository}/org/onap/policy/drools-applications/actor.mso/1.1.0-SNAPSHOT/actor.mso-1.1.0-SNAPSHOT.jar + + + + + + + + org.onap.policy.drools-applications + actorServiceProvider + 1.1.0-SNAPSHOT + provided + + + junit + junit + 4.12 + provided + + + diff --git a/controlloop/common/actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/Test.java b/controlloop/common/actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/Test.java new file mode 100644 index 000000000..f6eba49af --- /dev/null +++ b/controlloop/common/actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/Test.java @@ -0,0 +1,46 @@ +/*- + * ============LICENSE_START======================================================= + * actor test + * ================================================================================ + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop.actor.test; + +import static org.junit.Assert.*; + +import org.onap.policy.controlloop.actorServiceProvider.ActorService; +import org.onap.policy.controlloop.actorServiceProvider.spi.Actor; + +public class Test { + + @org.junit.Test + public void test() { + System.out.println("Dumping actors"); + ActorService actorService = ActorService.getInstance(); + assertNotNull(actorService); + int num = 0; + for (Actor actor : actorService.actors()) { + System.out.println(actor.actor()); + for (String recipe : actor.recipes()) { + System.out.println("\t" + recipe + " " + actor.recipeTargets(recipe) + " " + actor.recipePayloads(recipe)); + } + num++; + } + System.out.println("Found " + num + " actors"); + } + +} diff --git a/controlloop/common/actors/actorServiceProvider/pom.xml b/controlloop/common/actors/actorServiceProvider/pom.xml new file mode 100644 index 000000000..874871348 --- /dev/null +++ b/controlloop/common/actors/actorServiceProvider/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + org.onap.policy.drools-applications + actors + 1.1.0-SNAPSHOT + + actorServiceProvider + diff --git a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/ActorService.java b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/ActorService.java new file mode 100644 index 000000000..2632d0752 --- /dev/null +++ b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/ActorService.java @@ -0,0 +1,56 @@ +/*- + * ============LICENSE_START======================================================= + * ActorService + * ================================================================================ + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop.actorServiceProvider; + +import java.util.Iterator; +import java.util.ServiceLoader; + +import org.onap.policy.controlloop.actorServiceProvider.spi.Actor; +import com.google.common.collect.ImmutableList; + +public class ActorService { + + private static ActorService service; + + private ServiceLoader loader; + + private ActorService() { + loader = ServiceLoader.load(Actor.class); + } + + public static synchronized ActorService getInstance() { + if (service == null) { + service = new ActorService(); + } + return service; + } + + public ImmutableList actors() { + Iterator iter = loader.iterator(); + System.out.println("returning actors"); + while (iter.hasNext()) { + System.out.println("Got " + iter.next().actor()); + } + + return ImmutableList.copyOf(loader.iterator()); + } + +} diff --git a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/spi/Actor.java b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/spi/Actor.java new file mode 100644 index 000000000..2492063c8 --- /dev/null +++ b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorServiceProvider/spi/Actor.java @@ -0,0 +1,35 @@ +/*- + * ============LICENSE_START======================================================= + * Actor + * ================================================================================ + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.controlloop.actorServiceProvider.spi; + +import java.util.List; + +public interface Actor { + + public String actor(); + + public List recipes(); + + public List recipeTargets(String recipe); + + public List recipePayloads(String recipe); + +} diff --git a/controlloop/common/actors/pom.xml b/controlloop/common/actors/pom.xml new file mode 100644 index 000000000..a00a3af52 --- /dev/null +++ b/controlloop/common/actors/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + actors + pom + + + org.onap.policy.drools-applications + common + 1.1.0-SNAPSHOT + + + + actorServiceProvider + actor.appc + actor.mso + actor.test + + + + com.google.guava + guava + 19.0 + + + org.onap.policy.drools-applications + policy-yaml + 1.1.0-SNAPSHOT + + + -- cgit 1.2.3-korg