HONEYCOMB-22: Remove karaf based distribution and wiring

Change-Id: I48aafb726de53b6ad3fb9b97c202f712dfa4a540
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

6 files changed, 12 insertions, 12 deletions

diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy
index 9b7cfb4ae..8979272be 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy
@@ -19,13 +19,13 @@ package io.fd.honeycomb.infra.distro.initializer
 import com.google.inject.Inject
 import groovy.transform.ToString
 import groovy.util.logging.Slf4j
+import io.fd.honeycomb.data.init.RestorationType
 import io.fd.honeycomb.data.init.RestoringInitializer
 import io.fd.honeycomb.infra.distro.ProviderTrait
 import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker
 import org.opendaylight.controller.sal.core.api.model.SchemaService
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.data.init.rev160407.RestorationType
 
 import java.nio.file.Paths
 /**
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.groovy
index 726dfb5af..7e4453ef1 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.groovy
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/HoneycombNotification2NetconfProvider.groovy
@@ -26,7 +26,7 @@ import io.fd.honeycomb.notification.impl.NotificationProducerRegistry
 import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter
 import org.opendaylight.controller.sal.core.api.model.SchemaService
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.notification.impl.rev160601.HoneycombNotificationToNetconfTranslatorModule as Mirror
+import io.fd.honeycomb.notification.impl.TranslationUtil
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.StreamBuilder
 import org.opendaylight.yangtools.yang.model.api.SchemaPath
@@ -63,7 +63,7 @@ class HoneycombNotification2NetconfProvider extends ProviderTrait<HoneycombNotif
         // Notification Translator, get notification from HC producers and put into NETCONF notification collector
         def domNotificationListener = { notif ->
                 log.debug "Propagating notification: {} into NETCONF", notif.type
-                netconfNotifReg.onNotification(streamType, Mirror.notificationToXml(notif, schemaService.globalContext))
+                netconfNotifReg.onNotification(streamType, TranslationUtil.notificationToXml(notif, schemaService.globalContext))
         }
 
         // NotificationManager is used to provide list of available notifications (which are all of the notifications registered)
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.groovy
index 8c5dcab01..ebf6782c1 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.groovy
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfBindingBrokerProvider.groovy
@@ -23,7 +23,7 @@ import groovy.util.logging.Slf4j
 import io.fd.honeycomb.infra.distro.ProviderTrait
 import org.opendaylight.controller.md.sal.binding.api.DataBroker
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210.NetconfBindingBrokerModule
+import io.fd.honeycomb.impl.FakeBindingAwareBroker
 
 /**
  * Mirror of {@link org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210.NetconfBindingBrokerModule}
@@ -37,5 +37,5 @@ class NetconfBindingBrokerProvider extends ProviderTrait<BindingAwareBroker> {
     DataBroker dataBroker
 
     @Override
-    def create() { new NetconfBindingBrokerModule.FakeBindingAwareBroker(dataBroker) }
+    def create() { new FakeBindingAwareBroker(dataBroker) }
 }
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.groovy
index fee1944f4..6c58f8b89 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.groovy
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/netconf/NetconfMonitoringReaderFactoryProvider.groovy
@@ -23,7 +23,7 @@ import groovy.util.logging.Slf4j
 import io.fd.honeycomb.infra.distro.ProviderTrait
 import io.fd.honeycomb.translate.read.ReaderFactory
 import org.opendaylight.controller.md.sal.binding.api.DataBroker
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210.NetconfMonitoringReaderModule
+import io.fd.honeycomb.impl.NetconfMonitoringReaderFactory
 
 @Slf4j
 @ToString
@@ -33,5 +33,5 @@ class NetconfMonitoringReaderFactoryProvider extends ProviderTrait<ReaderFactory
     @Named("netconf")
     DataBroker netconfDataBroker
 
-    def create() { new NetconfMonitoringReaderModule.NetconfMonitoringReaderFactory(netconfDataBroker) }
+    def create() { new NetconfMonitoringReaderFactory(netconfDataBroker) }
 }
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
index d14feced0..606f44d8a 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
@@ -1,7 +1,7 @@
-{
-  "persisted-context-path": "~/honeycomb/persist/context/data.json",
+  {
+  "persisted-context-path": "/var/lib/honeycomb/persist/context/data.json",
   "persisted-context-restoration-type": "Merge",
-  "persisted-config-path": "~/honeycomb/persist/config/data.json",
+  "persisted-config-path": "/var/lib/honeycomb/persist/config/data.json",
   "persisted-config-restoration-type": "Merge",
 
   "notification-service-queue-depth": 1,
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
index ec7da7e13..d3cdd6f1e 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
@@ -6,10 +6,10 @@
     </encoder>
   </appender>
   <appender name="honeycomb.log" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>~/honeycomb/logs/honeycomb.log</file>
+    <file>/var/log/honeycomb/honeycomb.log</file>
 
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>~/honeycomb/logs/honeycomb.%d.log.zip</fileNamePattern>
+      <fileNamePattern>/var/log/honeycomb/logs/honeycomb.%d.log.zip</fileNamePattern>
       <maxHistory>1</maxHistory>
     </rollingPolicy>