HONEYCOMB-22: Remove karaf based distribution and wiring
authorMaros Marsalek <[email protected]>
Tue, 16 Aug 2016 09:04:00 +0000 (11:04 +0200)
committerMaros Marsalek <[email protected]>
Fri, 19 Aug 2016 10:49:56 +0000 (12:49 +0200)
Change-Id: I48aafb726de53b6ad3fb9b97c202f712dfa4a540
Signed-off-by: Maros Marsalek <[email protected]>
52 files changed:
packaging/rpm/persist/config/data.json [deleted file]
packaging/rpm/persist/context/data.json [deleted file]
v3po/features/pom.xml [deleted file]
v3po/features/src/main/features/features.xml [deleted file]
v3po/pom.xml
v3po/v3po2vpp/src/main/config/default-config.xml [deleted file]
v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/Readme.adoc [moved from v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/Readme.adoc with 100% similarity]
v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/VppClassifierHoneycombWriterFactory.java
v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/cfgattrs/V3poConfiguration.java
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java [deleted file]
v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java [deleted file]
v3po/v3po2vpp/src/main/resources/honeycomb-minimal-resources/config/v3po.json
v3po/v3po2vpp/src/main/yang/v3po2vpp.yang [deleted file]
vpp-common/features/pom.xml [deleted file]
vpp-common/features/src/main/features/features.xml [deleted file]
vpp-common/minimal-distribution/src/main/java/io/fd/honeycomb/vpp/distro/ContextsReaderFactoryProvider.groovy
vpp-common/naming-context-impl/src/main/config/default-config.xml [deleted file]
vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java [new file with mode: 0644]
vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModule.java [deleted file]
vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModuleFactory.java [deleted file]
vpp-common/naming-context-impl/src/main/yang/context-impl.yang [deleted file]
vpp-common/pom.xml
vpp-common/vpp-jvpp-cfg/pom.xml [deleted file]
vpp-common/vpp-jvpp-cfg/src/main/config/default-config.xml [deleted file]
vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModule.java [deleted file]
vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModuleFactory.java [deleted file]
vpp-common/vpp-jvpp-cfg/src/main/yang/vpp-jvpp-cfg.yang [deleted file]
vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModule.java [deleted file]
vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModuleFactory.java [deleted file]
vpp-common/vpp-translate-utils/src/main/yang/vpp-util.yang [deleted file]
vpp-integration/features/pom.xml [deleted file]
vpp-integration/features/src/main/features/features.xml [deleted file]
vpp-integration/karaf/pom.xml [deleted file]
vpp-integration/pom.xml

diff --git a/packaging/rpm/persist/config/data.json b/packaging/rpm/persist/config/data.json
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/packaging/rpm/persist/context/data.json b/packaging/rpm/persist/context/data.json
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/v3po/features/pom.xml b/v3po/features/pom.xml
deleted file mode 100644 (file)
index 8ffdb10..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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>features-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/features-parent</relativePath>
-  </parent>
-  <groupId>io.fd.honeycomb.v3po</groupId>
-  <artifactId>v3po-features</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.8.2-Beryllium-SR2</mdsal.model.version>
-    <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
-    <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
-    <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
-    <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
-    <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>vpp-common-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>v3po-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>v3po2vpp</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>v3po2vpp</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/v3po/features/src/main/features/features.xml b/v3po/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 9ef25aa..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 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.
--->
-<features name="odl-v3po-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-  <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
-  <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
-
-  <feature name='honeycomb-v3po-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <bundle>mvn:io.fd.honeycomb.v3po/v3po-api/{{VERSION}}</bundle>
-  </feature>
-
-  <feature name='honeycomb-v3po' version='${project.version}' description='OpenDaylight :: v3po'>
-    <feature version='${project.version}'>honeycomb</feature>
-    <feature version='${project.version}'>honeycomb-vpp-common</feature>
-    <feature version='${project.version}'>honeycomb-v3po-api</feature>
-    <bundle>mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}</bundle>
-    <configfile finalname="${configfile.directory}/honeycomb-v3po.xml">mvn:io.fd.honeycomb.v3po/v3po2vpp/{{VERSION}}/xml/config</configfile>
-  </feature>
-
-  <feature name='honeycomb-v3po-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
-    <feature version='${project.version}'>honeycomb-rest</feature>
-    <feature version='${project.version}'>honeycomb-v3po</feature>
-  </feature>
-
-</features>
index 16bc390..edfae24 100644 (file)
@@ -34,8 +34,6 @@
   <modules>
     <module>api</module>
     <module>v3po2vpp</module>
-    <!--Will be deleted-->
-    <!--<module>features</module>-->
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
diff --git a/v3po/v3po2vpp/src/main/config/default-config.xml b/v3po/v3po2vpp/src/main/config/default-config.xml
deleted file mode 100644 (file)
index e17d729..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-
-<snapshot>
-    <required-capabilities>
-        <capability>urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg?module=vpp-jvpp-cfg&amp;revision=2016-04-06</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:v3po2vpp?module=v3po2vpp&amp;revision=2016-04-06</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:vpp:util?module=vpp-util&amp;revision=2016-04-06</capability>
-        <capability>
-            urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl:scheduled?module=threadpool-impl-scheduled&amp;revision=2013-12-01
-        </capability>
-        <capability>urn:honeycomb:params:xml:ns:yang:notification:impl?module=notification-impl&amp;revision=2016-06-01</capability>
-    </required-capabilities>
-    <configuration>
-
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>interface-context</name>
-                    <artificial-name-prefix>interface-</artificial-name-prefix>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>bridge-domain-context</name>
-                    <artificial-name-prefix>bridge-domain-</artificial-name-prefix>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context-impl</type>
-                    <name>classify-table-context</name>
-                    <artificial-name-prefix>classify-table-</artificial-name-prefix>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-state-honeycomb-reader</type>
-                    <name>vpp-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context-vpp-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-vpp-state>
-                    <bridge-domain-context-vpp-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-vpp-state>
-                    <!-- Reuse netconf's scheduled executor for keepalives -->
-                    <keepalive-executor>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">
-                            prefix:threadpool
-                        </type>
-                        <name>global-netconf-ssh-scheduled-executor</name>
-                    </keepalive-executor>
-                </module>
-
-                <!-- Interface notification producer-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-interface-notification-producer</type>
-                    <name>vpp-interface-notification-producer</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context>
-                    <realtime-mapping-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-mapping-context</type>
-                        <name>realtime-mapping-context</name>
-                    </realtime-mapping-context>
-                </module>
-                <!-- Register to HC notification collector-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:impl">prefix:honeycomb-notification-manager</type>
-                    <name>honeycomb-notification-manager</name>
-                    <notification-producers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:api">prefix:honeycomb-notification-producer</type>
-                        <name>vpp-interface-notification-producer</name>
-                    </notification-producers>
-                </module>
-                <!-- /Interface notification producer -->
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-state-honeycomb-reader</type>
-                    <name>interfaces-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <interface-context-ifc-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-ifc-state>
-                    <bridge-domain-context-ifc-state>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-ifc-state>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-state-honeycomb-reader</type>
-                    <name>vpp-classifier-state-honeycomb-reader</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-honeycomb-writer</type>
-                    <name>vpp-honeycomb-writer</name>
-                    <vpp-jvpp-writer>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp-writer>
-                    <interface-context-vpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context-vpp>
-                    <bridge-domain-context-vpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context-vpp>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-honeycomb-writer</type>
-                    <name>interfaces-honeycomb-writer</name>
-                    <vpp-jvpp-ifc>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp-ifc>
-                    <interface-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>interface-context</name>
-                    </interface-context>
-                    <bridge-domain-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>bridge-domain-context</name>
-                    </bridge-domain-context>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-honeycomb-writer</type>
-                    <name>vpp-classifier-honeycomb-writer</name>
-                    <vpp-jvpp>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                        <name>vpp-jvpp</name>
-                    </vpp-jvpp>
-                    <classify-table-context>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                        <name>classify-table-context</name>
-                    </classify-table-context>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-reader-registry</type>
-                    <name>read-registry</name>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>vpp-state-honeycomb-reader</name>
-                    </reader-factory>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>interfaces-state-honeycomb-reader</name>
-                    </reader-factory>
-                    <reader-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                        <name>vpp-classifier-state-honeycomb-reader</name>
-                    </reader-factory>
-                </module>
-
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-writer-registry</type>
-                    <name>write-registry</name>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>vpp-honeycomb-writer</name>
-                    </writer-factory>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>interfaces-honeycomb-writer</name>
-                    </writer-factory>
-                    <writer-factory>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                        <name>vpp-classifier-honeycomb-writer</name>
-                    </writer-factory>
-                </module>
-
-                <!-- Config initializer for VPP subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-cfg-initializer</type>
-                    <name>vpp-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Config initializer for Interfaces subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:interfaces-cfg-initializer</type>
-                    <name>interfaces-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Config initializer for vpp-classifier subtree-->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:v3po2vpp">prefix:vpp-classifier-cfg-initializer</type>
-                    <name>vpp-classifier-cfg-initializer</name>
-                    <binding-data-broker>
-                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-async-data-broker</type>
-                        <name>cfg-init-binding-data-broker</name>
-                    </binding-data-broker>
-                </module>
-                <!-- Add vpp initializer to initializer registry -->
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer-registry</type>
-                    <name>initializer-registry</name>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>vpp-cfg-initializer</name>
-                    </initializers>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>interfaces-cfg-initializer</name>
-                    </initializers>
-                    <initializers>
-                        <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                        <name>vpp-classifier-cfg-initializer</name>
-                    </initializers>
-                </module>
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-                    <instance>
-                        <name>vpp-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='vpp-state-honeycomb-reader'][name='vpp-state-honeycomb-reader']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='interfaces-state-honeycomb-reader'][name='interfaces-state-honeycomb-reader']</provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-state-honeycomb-reader</name>
-                        <provider>/modules/module[type='vpp-classifier-state-honeycomb-reader'][name='vpp-classifier-state-honeycomb-reader']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:notification:api">prefix:honeycomb-notification-producer</type>
-                    <instance>
-                        <name>vpp-interface-notification-producer</name>
-                        <provider>/modules/module[type='vpp-interface-notification-producer'][name='vpp-interface-notification-producer']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:util">prefix:naming-context</type>
-                    <instance>
-                        <name>interface-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='interface-context']</provider>
-                    </instance>
-                    <instance>
-                        <name>bridge-domain-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='bridge-domain-context']</provider>
-                    </instance>
-                    <instance>
-                        <name>classify-table-context</name>
-                        <provider>/modules/module[type='naming-context-impl'][name='classify-table-context']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-writer-factory</type>
-                    <instance>
-                        <name>vpp-honeycomb-writer</name>
-                        <provider>/modules/module[type='vpp-honeycomb-writer'][name='vpp-honeycomb-writer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-honeycomb-writer</name>
-                        <provider>/modules/module[type='interfaces-honeycomb-writer'][name='interfaces-honeycomb-writer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-honeycomb-writer</name>
-                        <provider>/modules/module[type='vpp-classifier-honeycomb-writer'][name='vpp-classifier-honeycomb-writer']
-                        </provider>
-                    </instance>
-                </service>
-
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type>
-                    <instance>
-                        <name>vpp-cfg-initializer</name>
-                        <provider>/modules/module[type='vpp-cfg-initializer'][name='vpp-cfg-initializer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>interfaces-cfg-initializer</name>
-                        <provider>/modules/module[type='interfaces-cfg-initializer'][name='interfaces-cfg-initializer']
-                        </provider>
-                    </instance>
-                    <instance>
-                        <name>vpp-classifier-cfg-initializer</name>
-                        <provider>/modules/module[type='vpp-classifier-cfg-initializer'][name='vpp-classifier-cfg-initializer']
-                        </provider>
-                    </instance>
-                </service>
-            </services>
-        </data>
-    </configuration>
-</snapshot>
index 7c63076..98cb32e 100644 (file)
@@ -36,9 +36,10 @@ import org.openvpp.jvpp.future.FutureJVpp;
 public final class VppClassifierHoneycombWriterFactory implements WriterFactory, AutoCloseable {
 
     public static final InstanceIdentifier<ClassifyTable> CLASSIFY_TABLE_ID =
-        InstanceIdentifier.create(VppClassifier.class).child(ClassifyTable.class);
+            InstanceIdentifier.create(VppClassifier.class).child(ClassifyTable.class);
+
     public static final InstanceIdentifier<ClassifySession> CLASSIFY_SESSION_ID =
-        CLASSIFY_TABLE_ID.child(ClassifySession.class);
+            CLASSIFY_TABLE_ID.child(ClassifySession.class);
 
     private final FutureJVpp jvpp;
     private final NamingContext classifyTableContext;
@@ -59,8 +60,7 @@ public final class VppClassifierHoneycombWriterFactory implements WriterFactory,
                 CLASSIFY_SESSION_ID);
         //  ClassifyTableSession
         registry.addBefore(
-                new GenericListWriter<>(
-                        CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
+                new GenericListWriter<>(CLASSIFY_SESSION_ID, new ClassifySessionWriter(jvpp, classifyTableContext)),
                 ACL_ID);
     }
 }
index afe486c..9cf5b4d 100644 (file)
 package io.fd.honeycomb.translate.v3po.cfgattrs;
 
 import net.jmob.guice.conf.core.BindConfig;
-import net.jmob.guice.conf.core.InjectConfig;
 import net.jmob.guice.conf.core.Syntax;
 
 @BindConfig(value = "v3po", syntax = Syntax.JSON)
 public class V3poConfiguration {
-
-    @InjectConfig("some")
-    String some;
 }
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModule.java
deleted file mode 100644 (file)
index 606e278..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.InterfacesInitializer;
-
-public class InterfacesConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesConfigurationInitializerModule {
-    public InterfacesConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesConfigurationInitializerModuleFactory.java
deleted file mode 100644 (file)
index 726ab06..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu May 19 14:51:38 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModule.java
deleted file mode 100644 (file)
index e633920..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.InterfacesWriterFactory;
-
-public class InterfacesHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesHoneycombWriterModule {
-
-    // TODO split configuration and translation code into 2 or more bundles
-
-    public InterfacesHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                           org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                           org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                           org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesHoneycombWriterModule oldModule,
-                                           java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesWriterFactory(getVppJvppIfcDependency(),
-            getBridgeDomainContextDependency(),
-            getInterfaceContextDependency(),
-            getClassifyTableContextDependency());
-    }
-
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesHoneycombWriterModuleFactory.java
deleted file mode 100644 (file)
index 9332d30..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Apr 08 13:28:05 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
deleted file mode 100644 (file)
index 300f441..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.InterfacesStateReaderFactory;
-
-public class InterfacesStateHoneycombReaderModule extends
-        org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesStateHoneycombReaderModule {
-
-    public InterfacesStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                                org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public InterfacesStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                                org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                                org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.InterfacesStateHoneycombReaderModule oldModule,
-                                                java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfacesStateReaderFactory(getVppJvppDependency(),
-                getInterfaceContextIfcStateDependency(),
-                getBridgeDomainContextIfcStateDependency(),
-                getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModuleFactory.java
deleted file mode 100644 (file)
index f1c89f6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: interfaces-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Apr 08 10:39:04 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class InterfacesStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractInterfacesStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModule.java
deleted file mode 100644 (file)
index f83e546..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.VppClasifierInitializer;
-
-public class VppClassifierConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierConfigurationInitializerModule {
-    public VppClassifierConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClasifierInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierConfigurationInitializerModuleFactory.java
deleted file mode 100644 (file)
index 4e0e7c7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu Jul 14 16:02:24 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModule.java
deleted file mode 100644 (file)
index 172646c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppClassifierHoneycombWriterFactory;
-
-public class VppClassifierHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierHoneycombWriterModule {
-
-
-    public VppClassifierHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                              org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                              org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                              org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierHoneycombWriterModule oldModule,
-                                              java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClassifierHoneycombWriterFactory(
-            getVppJvppDependency(),
-            getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierHoneycombWriterModuleFactory.java
deleted file mode 100644 (file)
index c4ff690..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jun 03 14:05:48 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModule.java
deleted file mode 100644 (file)
index 4169b78..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppClassifierReaderFactory;
-
-public class VppClassifierStateHoneycombReaderModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierStateHoneycombReaderModule {
-    public VppClassifierStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppClassifierStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppClassifierStateHoneycombReaderModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppClassifierReaderFactory(getVppJvppDependency(), getClassifyTableContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppClassifierStateHoneycombReaderModuleFactory.java
deleted file mode 100644 (file)
index 2c16962..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-classifier-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Jul 19 13:04:20 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppClassifierStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppClassifierStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModule.java
deleted file mode 100644 (file)
index 266fc40..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.initializers.VppInitializer;
-
-public class VppConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppConfigurationInitializerModule {
-    public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppInitializer(getBindingDataBrokerDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppConfigurationInitializerModuleFactory.java
deleted file mode 100644 (file)
index 9ef01e8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-cfg-initializer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Thu May 19 14:51:38 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppConfigurationInitializerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModule.java
deleted file mode 100644 (file)
index 63a8a1b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppHoneycombWriterFactory;
-
-public class VppHoneycombWriterModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppHoneycombWriterModule {
-    public VppHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                    org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppHoneycombWriterModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                    org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppHoneycombWriterModule oldModule,
-                                    java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppHoneycombWriterFactory(
-                getVppJvppWriterDependency(),
-                getBridgeDomainContextVppDependency(),
-                getInterfaceContextVppDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppHoneycombWriterModuleFactory.java
deleted file mode 100644 (file)
index c350286..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-honeycomb-writer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 06 11:40:09 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppHoneycombWriterModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppHoneycombWriterModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModule.java
deleted file mode 100644 (file)
index bb31760..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.notification.InterfaceChangeNotificationProducer;
-
-public class VppInterfaceNotificationProducerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppInterfaceNotificationProducerModule {
-
-    public VppInterfaceNotificationProducerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppInterfaceNotificationProducerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppInterfaceNotificationProducerModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new InterfaceChangeNotificationProducer(
-            getVppJvppDependency(),
-            getInterfaceContextDependency(),
-            getRealtimeMappingContextDependency());
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppInterfaceNotificationProducerModuleFactory.java
deleted file mode 100644 (file)
index c80a0d3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-interface-notification-producer
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Jun 01 17:12:36 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppInterfaceNotificationProducerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppInterfaceNotificationProducerModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModule.java
deleted file mode 100644 (file)
index df216c0..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-
-import io.fd.honeycomb.translate.v3po.VppStateHoneycombReaderFactory;
-import java.lang.management.ManagementFactory;
-import javax.management.Attribute;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import org.opendaylight.controller.config.api.ConflictingVersionException;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.VppJvppImplModule;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.VppJvppImplModuleFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VppStateHoneycombReaderModule extends
-    org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppStateHoneycombReaderModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(VppStateHoneycombReaderModule.class);
-
-    public VppStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                         org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppStateHoneycombReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-                                         org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-                                         org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.VppStateHoneycombReaderModule oldModule,
-                                         java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new VppStateHoneycombReaderFactory(getVppJvppDependency(),
-                getInterfaceContextVppStateDependency(),
-                getBridgeDomainContextVppStateDependency(),
-                getKeepaliveExecutorDependency());
-    }
-
-    private static long reinitializationCounter;
-    private static final long reinitializationLimit = 10;
-
-    /**
-     * In case we detect connection issues with VPP, reinitialize JVpp.
-     */
-    private static void reinitializeJVpp(final long currentAttempt) {
-        // FIXME https://jira.fd.io/browse/HONEYCOMB-78 This code correctly re-initializes all the components
-        // starting with jvpp, but jvpp reconnect fails. Test in a JVpp test and then from C
-        LOG.info("Reinitializing JVpp, attempt: {}", currentAttempt);
-
-        final long nextAttempt = currentAttempt + 1;
-        if (nextAttempt - reinitializationCounter > reinitializationLimit) {
-            LOG.error("Too many JVpp reinitialization attempts. Unable to reinitialize JVpp in {} attempts. Giving up",
-                reinitializationLimit);
-            throw new IllegalStateException("Too many JVpp reinitialization attempts. Unable to reinitialize JVpp in "
-                + reinitializationLimit + " attempts. Giving up");
-        }
-
-        final ConfigRegistryJMXClient cfgRegistryClient =
-            ConfigRegistryJMXClient.createWithoutNotifications(ManagementFactory.getPlatformMBeanServer());
-
-        final ObjectName objectName = cfgRegistryClient.beginConfig();
-        final ConfigTransactionJMXClient txClient = cfgRegistryClient.getConfigTransactionClient(objectName);
-
-        final ObjectName jvppOn;
-        try {
-            final String attributeName = VppJvppImplModule.descriptionJmxAttribute.getAttributeName();
-            final String factoryName = VppJvppImplModuleFactory.NAME;
-            jvppOn = txClient.lookupConfigBean(factoryName, "vpp-jvpp");
-
-            // Change configuration attribute of JVpp to trigger full reinitialization here using config subsystem
-            // TODO improve this when switching from karaf in planned minimal distribution
-            txClient.setAttribute(jvppOn, attributeName, new Attribute(attributeName,
-                Long.toString(nextAttempt)));
-
-            txClient.validateConfig();
-            cfgRegistryClient.commitConfig(txClient.getObjectName());
-            LOG.info("JVpp reinitialized successfully");
-        } catch (InstanceNotFoundException | ValidationException e) {
-            LOG.error("Unable to reinitialize JVpp. Honeycomb will not work properly from now on.", e);
-            throw new IllegalStateException("Unable to find jvpp instance in config subsystem. Unable to reinitialize JVpp", e);
-        } catch (ConflictingVersionException e) {
-            LOG.debug("Conflict changes occurred, retrying", e);
-            // Just retry until there's no conflicting change in progress
-            reinitializeJVpp(nextAttempt);
-        }
-
-        reinitializationCounter = nextAttempt;
-    }
-
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/VppStateHoneycombReaderModuleFactory.java
deleted file mode 100644 (file)
index e9e1c94..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: v3po2vpp yang module local name: vpp-state-honeycomb-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 06 11:40:09 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
-public class VppStateHoneycombReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406.AbstractVppStateHoneycombReaderModuleFactory {
-
-}
diff --git a/v3po/v3po2vpp/src/main/yang/v3po2vpp.yang b/v3po/v3po2vpp/src/main/yang/v3po2vpp.yang
deleted file mode 100644 (file)
index 1e821f5..0000000
+++ /dev/null
@@ -1,367 +0,0 @@
-module v3po2vpp {
-    yang-version 1;
-    namespace "urn:honeycomb:params:xml:ns:yang:v3po2vpp";
-    prefix "v3po2vpp";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import translate-api { prefix tapi; revision-date 2016-04-06; }
-    import vpp-jvpp-cfg { prefix vjvppc; revision-date 2016-04-06; }
-    import cfg-init { prefix init; revision-date "2016-04-07"; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import vpp-util { prefix vpp-u; revision-date 2016-04-06; }
-    import threadpool {prefix th;}
-    import notification-api { prefix hc-notif-a; revision-date 2016-06-01; }
-
-    description
-        "This module contains reads and writers for v3po yang model";
-
-    revision "2016-04-06" {
-        description
-            "Initial revision.";
-    }
-
-    identity vpp-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'vpp-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-vpp-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-vpp-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container keepalive-executor {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity th:scheduled-threadpool;
-                    }
-                }
-
-                description "Used to schedule keepalives";
-            }
-        }
-    }
-
-    identity vpp-interface-notification-producer {
-        base config:module-type;
-        config:provided-service hc-notif-a:honeycomb-notification-producer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-interface-notification-producer {
-            when "/config:modules/config:module/config:type = 'vpp-interface-notification-producer'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container realtime-mapping-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity tapi:honeycomb-mapping-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity interfaces-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'interfaces-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-ifc-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-ifc-state {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-        }
-    }
-
-    identity vpp-classifier-state-honeycomb-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-state-honeycomb-reader {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-state-honeycomb-reader'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-
-    identity vpp-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'vpp-honeycomb-writer'";
-
-            container vpp-jvpp-writer {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context-vpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context-vpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity interfaces-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'interfaces-honeycomb-writer'";
-
-            container vpp-jvpp-ifc {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container interface-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container bridge-domain-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-
-        }
-    }
-
-    identity vpp-classifier-honeycomb-writer {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-writer-factory;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-honeycomb-writer {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-honeycomb-writer'";
-
-            container vpp-jvpp {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vjvppc:vpp-jvpp;
-                    }
-                }
-            }
-
-            container classify-table-context {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity vpp-u:naming-context;
-                    }
-                }
-            }
-        }
-    }
-
-    identity vpp-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix VppConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'vpp-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-    identity interfaces-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix InterfacesConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case interfaces-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'interfaces-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-    identity vpp-classifier-cfg-initializer {
-        base config:module-type;
-        config:provided-service init:cfg-initializer;
-        config:java-name-prefix VppClassifierConfigurationInitializer;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-classifier-cfg-initializer {
-            when "/config:modules/config:module/config:type = 'vpp-classifier-cfg-initializer'";
-
-             container binding-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-             }
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/vpp-common/features/pom.xml b/vpp-common/features/pom.xml
deleted file mode 100644 (file)
index e0ad56d..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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>features-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/features-parent</relativePath>
-  </parent>
-  <groupId>io.fd.honeycomb.vpp</groupId>
-  <artifactId>vpp-common-features</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <mdsal.model.version>0.8.2-Beryllium-SR2</mdsal.model.version>
-    <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
-    <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
-    <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
-    <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
-    <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <classifier>features</classifier>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>naming-context-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>naming-context-impl</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>naming-context-impl</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpp-jvpp-cfg</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpp-translate-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>vpp-jvpp-cfg</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>io.fd.vpp</groupId>
-      <artifactId>jvpp</artifactId>
-      <version>16.09-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/vpp-common/features/src/main/features/features.xml b/vpp-common/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 321f96e..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 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.
--->
-<features name="honeycomb-vpp-common-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
-
-  <feature name='honeycomb-vpp-common' version='${project.version}' description='OpenDaylight :: honeycomb :: vpp-common'>
-    <feature version='${project.version}'>honeycomb</feature>
-    <bundle>mvn:io.fd.honeycomb.vpp/naming-context-api/{{VERSION}}</bundle>
-    <bundle>mvn:io.fd.honeycomb.vpp/naming-context-impl/{{VERSION}}</bundle>
-    <bundle>wrap:mvn:io.fd.vpp/jvpp/{{VERSION}}</bundle>
-    <bundle>mvn:io.fd.honeycomb.vpp/vpp-jvpp-cfg/{{VERSION}}</bundle>
-    <bundle>mvn:io.fd.honeycomb.vpp/vpp-translate-utils/{{VERSION}}</bundle>
-    <configfile finalname="${configfile.directory}/honeycomb-jvpp.xml">mvn:io.fd.honeycomb.vpp/vpp-jvpp-cfg/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="${configfile.directory}/honeycomb-naming-context-reader.xml">mvn:io.fd.honeycomb.vpp/naming-context-impl/{{VERSION}}/xml/config</configfile>
-  </feature>
-
-</features>
index fe71cad..5016d4e 100644 (file)
@@ -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.context.impl.rev141210.ContextReaderModule
+import io.fd.honeycomb.vpp.context.ContextsReaderFactory
 
 /**
  * Mirror of org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210.ContextReaderModule
@@ -36,5 +36,5 @@ class ContextsReaderFactoryProvider extends ProviderTrait<ReaderFactory> {
     @Named("honeycomb-context")
     DataBroker contextDataBroker
 
-    def create() { new ContextReaderModule.ContextsReaderFactory(contextDataBroker) }
+    def create() { new ContextsReaderFactory(contextDataBroker) }
 }
diff --git a/vpp-common/naming-context-impl/src/main/config/default-config.xml b/vpp-common/naming-context-impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 5853758..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 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.
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:context:impl?module=context-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&amp;revision=2016-04-06</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg?module=vpp-jvpp-cfg&amp;revision=2016-04-06</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&amp;revision=2016-04-11</capability>
-      <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&amp;revision=2016-04-11</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <!-- Special reader for Context data. Providing context data to outside users over NETCONF/RESTCONF -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:context:impl">prefix:context-reader</type>
-          <name>context-reader</name>
-          <context-binding-broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-            <name>honeycomb-context-binding-data-broker</name>
-          </context-binding-broker>
-        </module>
-        <module>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:utils">prefix:delegating-reader-registry</type>
-          <name>read-registry</name>
-          <reader-factory>
-            <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-            <name>context-reader</name>
-          </reader-factory>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-
-        <service>
-          <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:translate:api">prefix:honeycomb-reader-factory</type>
-          <instance>
-            <name>context-reader</name>
-            <provider>/modules/module[type='context-reader'][name='context-reader']</provider>
-          </instance>
-        </service>
-
-      </services>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java b/vpp-common/naming-context-impl/src/main/java/io/fd/honeycomb/vpp/context/ContextsReaderFactory.java
new file mode 100644 (file)
index 0000000..6d3a3f1
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package io.fd.honeycomb.vpp.context;
+
+import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
+import io.fd.honeycomb.translate.util.read.BindingBrokerReader;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.Contexts;
+import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.ContextsBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+/**
+ * {@link io.fd.honeycomb.translate.read.ReaderFactory} initiating reader providing data from context data store.
+ * Making them available over RESTCONF/NETCONF.
+ */
+public final class ContextsReaderFactory implements AutoCloseable, io.fd.honeycomb.translate.read.ReaderFactory {
+
+    private final DataBroker contextBindingBrokerDependency;
+
+    public ContextsReaderFactory(final DataBroker contextBindingBrokerDependency) {
+        this.contextBindingBrokerDependency = contextBindingBrokerDependency;
+    }
+
+    @Override
+    public void init(final ModifiableReaderRegistryBuilder registry) {
+        registry.add(new BindingBrokerReader<>(InstanceIdentifier.create(Contexts.class),
+                contextBindingBrokerDependency,
+                LogicalDatastoreType.OPERATIONAL, ContextsBuilder.class));
+    }
+}
diff --git a/vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModule.java b/vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModule.java
deleted file mode 100644 (file)
index ccc01e0..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210;
-
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.util.read.BindingBrokerReader;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.Contexts;
-import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.naming.context.rev160513.ContextsBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-/**
-* A reader to provide naming context related data
-*/
-public class ContextReaderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210.AbstractContextReaderModule {
-    public ContextReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public ContextReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210.ContextReaderModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new ContextsReaderFactory(getContextBindingBrokerDependency());
-    }
-
-    public static final class ContextsReaderFactory implements AutoCloseable, io.fd.honeycomb.translate.read.ReaderFactory {
-
-        private final DataBroker contextBindingBrokerDependency;
-
-        public ContextsReaderFactory(final DataBroker contextBindingBrokerDependency) {
-            this.contextBindingBrokerDependency = contextBindingBrokerDependency;
-        }
-
-        @Override
-        public void init(final ModifiableReaderRegistryBuilder registry) {
-            registry.add(new BindingBrokerReader<>(InstanceIdentifier.create(Contexts.class),
-                    contextBindingBrokerDependency,
-                    LogicalDatastoreType.OPERATIONAL, ContextsBuilder.class));
-        }
-    }
-
-}
diff --git a/vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModuleFactory.java b/vpp-common/naming-context-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/context/impl/rev141210/ContextReaderModuleFactory.java
deleted file mode 100644 (file)
index aaafbc3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: context-impl yang module local name: context-reader
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jul 29 11:05:42 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210;
-public class ContextReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.context.impl.rev141210.AbstractContextReaderModuleFactory {
-
-}
diff --git a/vpp-common/naming-context-impl/src/main/yang/context-impl.yang b/vpp-common/naming-context-impl/src/main/yang/context-impl.yang
deleted file mode 100644 (file)
index 12861be..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-module context-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:context:impl";
-    prefix "v3po-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import translate-api { prefix tapi; revision-date 2016-04-06; }
-
-    description
-        "Service definition for v3po project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity context-reader {
-        base config:module-type;
-        config:provided-service tapi:honeycomb-reader-factory;
-        description "A reader to provide naming context related data";
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case context-reader {
-            when "/config:modules/config:module/config:type = 'context-reader'";
-
-            container context-binding-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-            }
-
-        }
-    }
-}
index 42a5221..4bcdd6c 100644 (file)
   </prerequisites>
   <modules>
     <module>vpp-translate-utils</module>
-    <module>vpp-jvpp-cfg</module>
     <module>naming-context-api</module>
     <module>naming-context-impl</module>
     <module>minimal-distribution</module>
-    <!--<module>features</module>-->
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
diff --git a/vpp-common/vpp-jvpp-cfg/pom.xml b/vpp-common/vpp-jvpp-cfg/pom.xml
deleted file mode 100644 (file)
index 79956ef..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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.0.0-SNAPSHOT</version>
-        <relativePath>../../common/impl-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.vpp</groupId>
-    <artifactId>vpp-jvpp-cfg</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.fd.vpp</groupId>
-            <artifactId>jvpp</artifactId>
-            <version>16.09-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/vpp-common/vpp-jvpp-cfg/src/main/config/default-config.xml b/vpp-common/vpp-jvpp-cfg/src/main/config/default-config.xml
deleted file mode 100644 (file)
index cbb614e..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  -->
-
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-
-<snapshot>
-    <required-capabilities>
-        <capability>urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg?module=vpp-jvpp-cfg&amp;revision=2016-04-06</capability>
-    </required-capabilities>
-    <configuration>
-
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp-impl</type>
-                    <name>vpp-jvpp</name>
-                </module>
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg">prefix:vpp-jvpp</type>
-                    <instance>
-                        <name>vpp-jvpp</name>
-                        <provider>/modules/module[type='vpp-jvpp-impl'][name='vpp-jvpp']
-                        </provider>
-                    </instance>
-                </service>
-            </services>
-        </data>
-    </configuration>
-</snapshot>
diff --git a/vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModule.java b/vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModule.java
deleted file mode 100644 (file)
index 8eb504a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406;
-
-import java.io.IOException;
-import org.openvpp.jvpp.JVppImpl;
-import org.openvpp.jvpp.VppJNIConnection;
-import org.openvpp.jvpp.future.FutureJVppFacade;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class VppJvppImplModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.AbstractVppJvppImplModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(VppJvppImplModule.class);
-
-    public VppJvppImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public VppJvppImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.VppJvppImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        try {
-            final JVppImpl jVpp = new JVppImpl(new VppJNIConnection(getName()));
-            LOG.info("JVpp connection opened successfully as: {}", getName());
-            return new FutureJVppFacade(jVpp) {
-                @Override
-                public void close() throws Exception {
-                    super.close();
-                    LOG.info("Closing JVpp connection: {}", getName());
-                    jVpp.close();
-                }
-            };
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to open VPP management connection", e);
-        }
-    }
-
-}
diff --git a/vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModuleFactory.java b/vpp-common/vpp-jvpp-cfg/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/jvpp/cfg/rev160406/VppJvppImplModuleFactory.java
deleted file mode 100644 (file)
index 7115109..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: vpp-jvpp-cfg yang module local name: vpp-jvpp-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Apr 29 11:20:56 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406;
-public class VppJvppImplModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.jvpp.cfg.rev160406.AbstractVppJvppImplModuleFactory {
-
-}
diff --git a/vpp-common/vpp-jvpp-cfg/src/main/yang/vpp-jvpp-cfg.yang b/vpp-common/vpp-jvpp-cfg/src/main/yang/vpp-jvpp-cfg.yang
deleted file mode 100644 (file)
index 01a0bf3..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-module vpp-jvpp-cfg {
-    yang-version 1;
-    namespace "urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg";
-    prefix "vjvppc";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    description
-        "This module contains the base YANG definitions for
-         readers/writers plugged into a honeycomb";
-
-    revision "2016-04-06" {
-        description
-            "Initial revision.";
-    }
-
-    identity vpp-jvpp {
-        base "config:service-type";
-        config:java-class org.openvpp.jvpp.future.FutureJVpp;
-    }
-
-    identity vpp-jvpp-impl {
-        base config:module-type;
-        config:provided-service vpp-jvpp;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case vpp-jvpp-impl {
-            when "/config:modules/config:module/config:type = 'vpp-jvpp-impl'";
-
-            leaf name {
-                type string;
-                default "v3poODL";
-            }
-
-            leaf description {
-                type string;
-                description "Artificial leaf just to trigger reinitialization of JVpp from HC";
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModule.java b/vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModule.java
deleted file mode 100644 (file)
index bff1a3a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.util.rev160406;
-
-import io.fd.honeycomb.translate.v3po.util.NamingContext;
-
-public class NamingContextImplModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.util.rev160406.AbstractNamingContextImplModule {
-    public NamingContextImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NamingContextImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.util.rev160406.NamingContextImplModule oldModule, java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // add custom validation form module attributes here.
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        return new NamingContext(
-            getArtificialNamePrefix(),
-            getIdentifier().getInstanceName());
-    }
-
-}
diff --git a/vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModuleFactory.java b/vpp-common/vpp-translate-utils/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/util/rev160406/NamingContextImplModuleFactory.java
deleted file mode 100644 (file)
index c777daf..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: vpp-util yang module local name: naming-context-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Mon May 02 10:57:32 CEST 2016
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.util.rev160406;
-public class NamingContextImplModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.util.rev160406.AbstractNamingContextImplModuleFactory {
-
-}
diff --git a/vpp-common/vpp-translate-utils/src/main/yang/vpp-util.yang b/vpp-common/vpp-translate-utils/src/main/yang/vpp-util.yang
deleted file mode 100644 (file)
index f9d090c..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-module vpp-util {
-    yang-version 1;
-    namespace "urn:honeycomb:params:xml:ns:yang:vpp:util";
-    prefix "vpp-u";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import data-api { prefix dapi; revision-date 2016-04-11; }
-
-    description
-        "This module contains utilities for vpp readers/writers";
-
-    revision "2016-04-06" {
-        description
-            "Initial revision.";
-    }
-
-    identity naming-context {
-        base "config:service-type";
-        config:java-class io.fd.honeycomb.translate.v3po.util.NamingContext;
-    }
-
-    identity naming-context-impl {
-        base config:module-type;
-        config:provided-service naming-context;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case naming-context-impl {
-            when "/config:modules/config:module/config:type = 'naming-context-impl'";
-
-            leaf artificial-name-prefix {
-                type string;
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/vpp-integration/features/pom.xml b/vpp-integration/features/pom.xml
deleted file mode 100644 (file)
index 9e8930d..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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>features-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/features-parent</relativePath>
-  </parent>
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
-  <artifactId>vpp-integration-features</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <dependencies>
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>vpp-common-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/vpp-integration/features/src/main/features/features.xml b/vpp-integration/features/src/main/features/features.xml
deleted file mode 100644 (file)
index 3dcc7c6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2015 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.
--->
-<features name="honeycomb-integration-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-  <!-- infra -->
-  <repository>mvn:io.fd.honeycomb/honeycomb-features/${project.version}/xml/features</repository>
-  <!-- VPP HC plugin common code -->
-  <repository>mvn:io.fd.honeycomb.vpp/vpp-common-features/${project.version}/xml/features</repository>
-  <!-- V3PO plugin -->
-  <repository>mvn:io.fd.honeycomb.v3po/v3po-features/${project.version}/xml/features</repository>
-
-  <feature name='honeycomb-vpp-integration-api' version='${project.version}' description='OpenDaylight :: v3po :: api'>
-    <feature version='${project.version}'>honeycomb-api</feature>
-    <feature version='${project.version}'>honeycomb-v3po-api</feature>
-  </feature>
-
-  <feature name='honeycomb-vpp-integration' version='${project.version}' description='OpenDaylight :: v3po'>
-    <feature version='${project.version}'>honeycomb-vpp-integration-api</feature>
-    <feature version='${project.version}'>honeycomb</feature>
-    <feature version='${project.version}'>honeycomb-vpp-common</feature>
-    <feature version='${project.version}'>honeycomb-v3po</feature>
-  </feature>
-
-  <feature name='honeycomb-vpp-integration-rest' version='${project.version}' description='OpenDaylight :: v3po :: rest'>
-    <feature version='${project.version}'>honeycomb-vpp-integration</feature>
-    <feature version='${project.version}'>honeycomb-rest</feature>
-    <feature version='${project.version}'>honeycomb-v3po</feature>
-  </feature>
-
-</features>
diff --git a/vpp-integration/karaf/pom.xml b/vpp-integration/karaf/pom.xml
deleted file mode 100644 (file)
index 1232e73..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 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.
--->
-<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>karaf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../common/karaf-parent</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>io.fd.honeycomb.vpp.integration</groupId>
-  <artifactId>vpp-integration-karaf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>honeycomb-vpp-integration-rest</karaf.localFeature>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb</groupId>
-      <artifactId>honeycomb-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp</groupId>
-      <artifactId>vpp-common-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb.v3po</groupId>
-      <artifactId>v3po-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.fd.honeycomb.vpp.integration</groupId>
-      <artifactId>vpp-integration-features</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <!-- DO NOT install or deploy the karaf artifact -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
index e087abd..741951b 100644 (file)
@@ -31,8 +31,6 @@
     <maven>3.1.1</maven>
   </prerequisites>
   <modules>
-    <!--<module>features</module>-->
-    <!--<module>karaf</module>-->
     <module>minimal-distribution</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->