Update Honeycomb to Rel1810 for vFW

- Update Honeycomb version to 1810 to support ODL Fluorine
- Migrate existing stream-count plugin to 1810
- Update POM structure
- Update vPacketGen install file (including ARM64)

Change-Id: I2866c80876550cb149cdb5fee3193d453643639c
Issue-ID: INT-1035
Signed-off-by: Marco Platania <platania@research.att.com>

10 files changed, 30 insertions, 91 deletions

diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/Readme.adoc b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/Readme.adoc
deleted file mode 100644
index 5e347d27..00000000
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
---Documentation for stream-count --
-
-TODO Replace with general description whats the purpose of stream-count and how it works
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/asciidoc/Readme.adoc b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/asciidoc/Readme.adoc
new file mode 100644
index 00000000..98561bb1
--- /dev/null
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/asciidoc/Readme.adoc
@@ -0,0 +1,3 @@
+= stream-count-impl
+
+Overview of stream-count-impl
\ No newline at end of file
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/pom.xml b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/pom.xml
index 25d6d765..1ccd5c14 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/pom.xml
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/pom.xml
@@ -12,21 +12,28 @@
  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.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+-->
+
+<!--
+    Modifications copyright © 2019 AT&T Intellectual Property
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>impl-parent</artifactId>
-        <version>1.16.9</version>
+        <version>1.18.10</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.lcmapi</groupId>
+    <groupId>org.onap.vnf.vfw</groupId>
     <artifactId>stream-count-impl</artifactId>
-    <version>1.16.9</version>
+    <name>stream-count-impl</name>
+    <version>1.18.10</version>
     <packaging>bundle</packaging>
 
     <properties>
-        <honeycomb.infra.version>1.16.9</honeycomb.infra.version>
+        <honeycomb.infra.version>1.18.10</honeycomb.infra.version>
     </properties>
 
     <dependencies>
@@ -59,21 +66,18 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
         </dependency>
         <dependency>
             <groupId>net.jmob</groupId>
             <artifactId>guice.conf</artifactId>
-            <version>${guice.config.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-multibindings</artifactId>
-            <version>${guice.version}</version>
         </dependency>
     </dependencies>
 
-  <build>
+    <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/init/ConfigDataInitializer.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/init/ConfigDataInitializer.java
deleted file mode 100644
index 16edd1bc..00000000
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/init/ConfigDataInitializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * 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.
- */
-
-/*
- * Modifications copyright (c) 2019 AT&T Intellectual Property
- */
-
-package io.fd.honeycomb.lcmapi.init;
-
-import io.fd.honeycomb.data.init.AbstractDataTreeConverter;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.StreamCount;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.StreamCountBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.StreamCountState;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-/**
- * Initialize configuration data based on operational data.
- * <p/>
- * Very useful when a plugin is initiated but the underlying layer already contains some operation state.
- * Deriving the configuration from existing operational state enables reconciliation in case when Honeycomb's persistence
- * is not available to do the work for us.
- */
-public final class ConfigDataInitializer extends AbstractDataTreeConverter<StreamCountState, StreamCount> {
-
-    @Inject
-    public ConfigDataInitializer(@Named("honeycomb-initializer") @Nonnull final DataBroker bindingDataBroker) {
-        super(bindingDataBroker, InstanceIdentifier.create(StreamCountState.class), InstanceIdentifier.create(StreamCount.class));
-    }
-
-    @Override
-    public StreamCount convert(final StreamCountState operationalData) {
-        // Transfer all the operational data into configuration
-        return new StreamCountBuilder()
-                .setStreams(operationalData.getStreams())
-                .build();
-    }
-}
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/CrudService.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/CrudService.java
index b9d7f1bb..33b2e18f 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/CrudService.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/CrudService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.lcmapi;
+package org.onap.vnf.vfw;
 
 import io.fd.honeycomb.translate.read.ReadFailedException;
 import io.fd.honeycomb.translate.write.WriteFailedException;
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/ElementCrudService.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/ElementCrudService.java
index fa6a31d5..945f992c 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/ElementCrudService.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/ElementCrudService.java
@@ -18,7 +18,7 @@
  * Modifications copyright (c) 2019 AT&T Intellectual Property
  */
 
-package io.fd.honeycomb.lcmapi;
+package org.onap.vnf.vfw;
 
 import io.fd.honeycomb.translate.read.ReadFailedException;
 import io.fd.honeycomb.translate.write.WriteFailedException;
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/Module.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/Module.java
index 05109db3..31ba56e1 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/Module.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/Module.java
@@ -18,16 +18,15 @@
  * Modifications copyright (c) 2019 AT&T Intellectual Property
  */
 
-package io.fd.honeycomb.lcmapi;
+package org.onap.vnf.vfw;
 
-import static io.fd.honeycomb.lcmapi.ModuleConfiguration.ELEMENT_SERVICE_NAME;
+import static org.onap.vnf.vfw.ModuleConfiguration.ELEMENT_SERVICE_NAME;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
-import io.fd.honeycomb.lcmapi.init.ConfigDataInitializer;
-import io.fd.honeycomb.lcmapi.write.ModuleWriterFactory;
+import org.onap.vnf.vfw.write.ModuleWriterFactory;
 import io.fd.honeycomb.data.init.DataTreeInitializer;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import net.jmob.guice.conf.core.ConfigurationModule;
@@ -60,11 +59,5 @@ public final class Module extends AbstractModule {
         // can hold multiple binding for separate yang modules
         final Multibinder<WriterFactory> writerFactoryBinder = Multibinder.newSetBinder(binder(), WriterFactory.class);
         writerFactoryBinder.addBinding().to(ModuleWriterFactory.class);
-
-        // create initializer binding
-        // can hold multiple binding for separate yang modules
-        final Multibinder<DataTreeInitializer> initializerBinder =
-                Multibinder.newSetBinder(binder(), DataTreeInitializer.class);
-        initializerBinder.addBinding().to(ConfigDataInitializer.class);
     }
 }
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/ModuleConfiguration.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/ModuleConfiguration.java
index c574b3ef..c229c5ad 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/ModuleConfiguration.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/ModuleConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.fd.honeycomb.lcmapi;
+package org.onap.vnf.vfw;
 
 import net.jmob.guice.conf.core.BindConfig;
 import net.jmob.guice.conf.core.InjectConfig;
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ElementCustomizer.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/write/ElementCustomizer.java
index 740ffdf7..18329e84 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ElementCustomizer.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/write/ElementCustomizer.java
@@ -18,26 +18,22 @@
  * Modifications copyright (c) 2019 AT&T Intellectual Property
  */
 
-package io.fd.honeycomb.lcmapi.write;
+package org.onap.vnf.vfw.write;
 
-import io.fd.honeycomb.lcmapi.CrudService;
+import org.onap.vnf.vfw.CrudService;
 import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-
-import java.io.IOException;
-
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.stream.count.params.Streams;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
+import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Writer for {@link Element} list node from our YANG model.
  */
-
 public final class ElementCustomizer implements WriterCustomizer<Streams> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElementCustomizer.class);
@@ -92,9 +88,9 @@ public final class ElementCustomizer implements WriterCustomizer<Streams> {
     //Update the number of running streams running a custom script that uses the old vPacketGen REST APIs
     private void runScript(long streams) throws IOException {
 
-        String script = new String("bash /opt/update_running_streams.sh " + streams);
+        String script = new String("bash /opt/enable_disable_streams.sh " + streams);
         Runtime.getRuntime().exec(script);
         String message = "Number of running streams updated to " + streams;
         LOG.info(message);
     }
-}
+}
\ No newline at end of file
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ModuleWriterFactory.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/write/ModuleWriterFactory.java
index 1de39761..0bd7b8e1 100644
--- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ModuleWriterFactory.java
+++ b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/org/onap/vnf/vfw/write/ModuleWriterFactory.java
@@ -18,13 +18,13 @@
  * Modifications copyright (c) 2019 AT&T Intellectual Property
  */
 
-package io.fd.honeycomb.lcmapi.write;
+package org.onap.vnf.vfw.write;
 
-import static io.fd.honeycomb.lcmapi.ModuleConfiguration.ELEMENT_SERVICE_NAME;
+import static org.onap.vnf.vfw.ModuleConfiguration.ELEMENT_SERVICE_NAME;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.fd.honeycomb.lcmapi.CrudService;
+import org.onap.vnf.vfw.CrudService;
 import io.fd.honeycomb.translate.impl.write.GenericWriter;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;