Remove config subsystem remains 31/59231/8
authorTomas Slusny <tomas.slusny@pantheon.tech>
Thu, 22 Jun 2017 15:53:13 +0000 (17:53 +0200)
committerTomas Slusny <tomas.slusny@pantheon.tech>
Fri, 23 Jun 2017 13:05:53 +0000 (15:05 +0200)
- Remove what was left from config subsystem from project, as everything
was moved to Blueprint already.
- Cleanup artifacts POM, remove references to config subsystem config
files

Resolves: bug 8728

Change-Id: Ic6adcbc333e816aa15b546e44536d23c8ef4125b
Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
17 files changed:
artifacts/pom.xml
extension/openflowplugin-extension-onf/pom.xml
openflowplugin-controller-config/pom.xml [deleted file]
openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml [deleted file]
openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml [deleted file]
openflowplugin-controller-config/src/main/resources/initial/43-msg-spy.xml [deleted file]
openflowplugin-impl/pom.xml
openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java [deleted file]
openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModuleFactory.java [deleted file]
openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang [deleted file]
openflowplugin/pom.xml
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModule.java [deleted file]
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModuleFactory.java [deleted file]
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java [deleted file]
openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModuleFactory.java [deleted file]
pom.xml
src/test/resources/controller.xml [deleted file]

index a2c52f10f1137b5c1a5122b7a75426f4ec862320..b5fb2b681483b76cee18f840c96051d8fe70a830 100644 (file)
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-extension-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-extension-nicira</artifactId>
+                <artifactId>openflowplugin-blueprint-config</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-extension-onf</artifactId>
+                <artifactId>drop-test-karaf</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-extension-nicira</artifactId>
+                <artifactId>openflowplugin-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>openflowjava-extension-nicira-api</artifactId>
+                <artifactId>test-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- models -->
             <dependency>
                 <groupId>${project.groupId}.model</groupId>
                 <artifactId>model-flow-base</artifactId>
                 <artifactId>model-flow-statistics</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- extensions -->
             <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>forwardingrules-manager</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>forwardingrules-sync</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-nicira</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>forwardingrules-sync</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowjava-extension-nicira-api</artifactId>
                 <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>xml</type>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>inventory-manager</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowjava-extension-nicira</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>lldp-speaker</artifactId>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>openflowplugin-extension-onf</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- applications -->
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
-                <artifactId>statistics-manager</artifactId>
+                <artifactId>bulk-o-matic</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
-                <artifactId>table-miss-enforcer</artifactId>
+                <artifactId>forwardingrules-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
-                <artifactId>topology-lldp-discovery</artifactId>
+                <artifactId>forwardingrules-sync</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
-                <artifactId>topology-manager</artifactId>
+                <artifactId>inventory-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
-                <artifactId>of-switch-config-pusher</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>drop-test-karaf</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.legacy</groupId>
-                <artifactId>sal-compatibility</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-common</artifactId>
+                <artifactId>lldp-speaker</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>test-common</artifactId>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>statistics-manager</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>${project.groupId}.applications</groupId>
                 <artifactId>table-miss-enforcer</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-blueprint-config</artifactId>
-                <version>${project.version}</version>
-                <type>cfg</type>
-                <classifier>config</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-controller-config</artifactId>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-lldp-discovery</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config-He</classifier>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-controller-config</artifactId>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>topology-manager</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config-Li</classifier>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-controller-config</artifactId>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>of-switch-config-pusher</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>configmsgspy</classifier>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>openflowplugin-extension-nicira-config</artifactId>
+                <groupId>${project.groupId}.applications</groupId>
+                <artifactId>notification-supplier</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
             </dependency>
+            <!-- config files -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>drop-test-karaf</artifactId>
+                <artifactId>openflowplugin-blueprint-config</artifactId>
                 <version>${project.version}</version>
-                <type>xml</type>
+                <type>cfg</type>
                 <classifier>config</classifier>
             </dependency>
-
+            <!-- features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-openflowplugin</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>bulk-o-matic</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>bulk-o-matic</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>notification-supplier</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>config</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}.applications</groupId>
-                <artifactId>notification-supplier</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-openflowplugin-flow-services-rest</artifactId>
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 </project>
index bae104d5d970299870976cc948573697f19fdfbc..48c6cefe90ac1e6803129e3608f32731858343d6 100644 (file)
@@ -68,7 +68,6 @@
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-blueprint-config</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowjava</groupId>
diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
deleted file mode 100644 (file)
index f63939f..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<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">
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-parent</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
-      <relativePath>../parent</relativePath>
-    </parent>
-
-    <artifactId>openflowplugin-controller-config</artifactId>
-    <description>Controller Configuration files for openflowplugin + openflowjava couple</description>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/initial/42-openflowplugin.xml</file>
-                                    <type>xml</type>
-                                    <classifier>config-He</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>attach-artifacts-ofp-cfg</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/initial/42-openflowplugin-new.xml</file>
-                                    <type>xml</type>
-                                    <classifier>config-Li</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>attach-artifacts-msgspy</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/initial/43-msg-spy.xml</file>
-                                    <type>xml</type>
-                                    <classifier>configmsgspy</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin-new.xml
deleted file mode 100644 (file)
index 18a356d..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
-
-NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for
-       backwards compatibility. Runtime modifications are not honored.
--->
-<snapshot>
-    <required-capabilities>
-        <!-- openflowjava -->
-        <capability>
-            urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28
-        </capability>
-        <capability>
-            urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28
-        </capability>
-        <!-- openflowplugin -->
-        <capability>urn:opendaylight:params:xml:ns:yang:config:openflow:plugin:impl?module=openflow-plugin-provider-impl&amp;revision=2015-03-27</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:openflow:api?module=openflow-provider&amp;revision=2015-03-31</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:extension:api?module=openflowplugin-extension-registry&amp;revision=2015-04-25</capability>
-        <!-- binding-broker-impl - provided -->
-    </required-capabilities>
-
-    <configuration>
-
-        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <!-- default OF-switch-connection-provider (port 6633) -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">
-                        prefix:openflow-switch-connection-provider-impl
-                    </type>
-                    <name>openflow-switch-connection-provider-default-impl</name>
-                    <port>6633</port>
-                    <!--      Possible transport-protocol options: TCP, TLS, UDP -->
-                    <transport-protocol>TCP</transport-protocol>
-                    <switch-idle-timeout>15000</switch-idle-timeout>
-                </module>
-                <!-- default OF-switch-connection-provider (port 6653) -->
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">
-                        prefix:openflow-switch-connection-provider-impl
-                    </type>
-                    <name>openflow-switch-connection-provider-legacy-impl</name>
-                    <port>6653</port>
-                    <!--      Possible transport-protocol options: TCP, TLS, UDP -->
-                    <transport-protocol>TCP</transport-protocol>
-                    <switch-idle-timeout>15000</switch-idle-timeout>
-                </module>
-
-
-                <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:config:openflow:plugin:impl">
-                        prefix:openflow-plugin-provider-impl
-                    </type>
-                    <name>openflow-plugin-provider-impl</name>
-
-                    <openflow-switch-connection-provider>
-                        <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-                        <name>openflow-switch-connection-provider-default</name>
-                    </openflow-switch-connection-provider>
-                    <openflow-switch-connection-provider>
-                        <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-                        <name>openflow-switch-connection-provider-legacy</name>
-                    </openflow-switch-connection-provider>
-
-                    <data-broker>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                        <name>pingpong-binding-data-broker</name>
-                    </data-broker>
-                    <rpc-registry>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                        <name>binding-rpc-broker</name>
-                    </rpc-registry>
-                    <notification-adapter>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-new-notification-service</type>
-                        <name>binding-notification-adapter</name>
-                    </notification-adapter>
-                    <notification-publish-adapter>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-new-notification-publish-service</type>
-                        <name>binding-notification-publish-adapter</name>
-                    </notification-publish-adapter>
-                    <entity-ownership-service>
-                        <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
-                        <name>entity-ownership-service</name>
-                    </entity-ownership-service>
-                    <rpc-requests-quota>20000</rpc-requests-quota>
-                    <switch-features-mandatory>false</switch-features-mandatory>
-                    <global-notification-quota>64000</global-notification-quota>
-                    <is-statistics-polling-on>true</is-statistics-polling-on>
-                    <barrier-interval-timeout-limit>500</barrier-interval-timeout-limit>
-                    <barrier-count-limit>25600</barrier-count-limit>
-                    <echo-reply-timeout>2000</echo-reply-timeout>
-                </module>
-            </modules>
-
-            <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <service>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">prefix:openflow-switch-connection-provider</type>
-                    <instance>
-                        <name>openflow-switch-connection-provider-default</name>
-                        <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-default-impl']</provider>
-                    </instance>
-                    <instance>
-                        <name>openflow-switch-connection-provider-legacy</name>
-                        <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-legacy-impl']</provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:api">
-                        prefix:openflow-provider
-                    </type>
-                    <instance>
-                        <name>openflow-provider</name>
-                        <provider>
-                            /modules/module[type='openflow-plugin-provider-impl'][name='openflow-plugin-provider-impl']
-                        </provider>
-                    </instance>
-                </service>
-                <service>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:extension:api">prefix:openflow-extension-registry-provider</type>
-                    <instance>
-                        <name>openflow-ext-provider</name>
-                        <provider>
-                            /modules/module[type='openflow-plugin-provider-impl'][name='openflow-plugin-provider-impl']
-                        </provider>
-                    </instance>
-                </service>
-            </services>
-        </data>
-
-    </configuration>
-</snapshot>
diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml
deleted file mode 100644 (file)
index 39ff549..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-    <!-- openflowjava -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28</capability>
-    <!-- openflowplugin -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl?module=openflow-provider-impl&amp;revision=2014-03-26</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config?module=openflow-provider&amp;revision=2014-03-26</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:openflowplugin:extension:api?module=openflowplugin-extension-registry&amp;revision=2015-04-25</capability>
-    <!-- binding-broker-impl - provided -->
-  </required-capabilities>
-
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <!-- default OF-switch-connection-provider (port 6633) -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">prefix:openflow-switch-connection-provider-impl</type>
-          <name>openflow-switch-connection-provider-default-impl</name>
-          <port>6633</port>
-<!--      Possible transport-protocol options: TCP, TLS, UDP -->
-          <transport-protocol>TCP</transport-protocol>
-          <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy exemplary-switch-privkey.pem, exemplary-switch-cert.pem and exemplary-cacert.pem
-                  files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls> -->
-<!--           Exemplary thread model configuration. Uncomment <threads> tag below to adjust default thread model -->
-<!--           <threads>
-                 <boss-threads>2</boss-threads>
-                 <worker-threads>8</worker-threads>
-               </threads> -->
-        </module>
-        <!-- default OF-switch-connection-provider (port 6653) -->
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">prefix:openflow-switch-connection-provider-impl</type>
-          <name>openflow-switch-connection-provider-legacy-impl</name>
-          <port>6653</port>
-<!--      Possible transport-protocol options: TCP, TLS, UDP -->
-          <transport-protocol>TCP</transport-protocol>
-          <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy exemplary-switch-privkey.pem, exemplary-switch-cert.pem and exemplary-cacert.pem
-                  files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls> -->
-<!--           Exemplary thread model configuration. Uncomment <threads> tag below to adjust default thread model -->
-<!--           <threads>
-                 <boss-threads>2</boss-threads>
-                 <worker-threads>8</worker-threads>
-               </threads> -->
-        </module>
-
-
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl">prefix:openflow-provider-impl</type>
-          <name>openflow-provider-impl</name>
-
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-default</name>
-          </openflow-switch-connection-provider>
-          <openflow-switch-connection-provider>
-            <type xmlns:ofSwitch="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">ofSwitch:openflow-switch-connection-provider</type>
-            <name>openflow-switch-connection-provider-legacy</name>
-          </openflow-switch-connection-provider>
-
-            <data-broker>
-                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
-                <name>pingpong-binding-data-broker</name>
-            </data-broker>
-            <rpc-registry>
-                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                <name>binding-rpc-broker</name>
-            </rpc-registry>
-            <notification-service>
-                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                <name>binding-notification-broker</name>
-            </notification-service>
-            <ownership-service>
-                <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
-                <name>entity-ownership-service</name>
-            </ownership-service>
-
-          <!-- openflowplugin configuraion -->
-          <skip-table-features>false</skip-table-features>
-
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider">prefix:openflow-switch-connection-provider</type>
-          <instance>
-            <name>openflow-switch-connection-provider-default</name>
-            <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-default-impl']</provider>
-          </instance>
-          <instance>
-            <name>openflow-switch-connection-provider-legacy</name>
-            <provider>/modules/module[type='openflow-switch-connection-provider-impl'][name='openflow-switch-connection-provider-legacy-impl']</provider>
-          </instance>
-        </service>
-
-        <service>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:common:config">prefix:openflow-provider</type>
-          <instance>
-            <name>openflow-provider</name>
-            <provider>/modules/module[type='openflow-provider-impl'][name='openflow-provider-impl']</provider>
-          </instance>
-        </service>
-
-          <service>
-              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflowplugin:extension:api">prefix:openflow-extension-registry-provider</type>
-              <instance>
-                  <name>openflow-ext-provider</name>
-                  <provider>/modules/module[type='openflow-provider-impl'][name='openflow-provider-impl']</provider>
-              </instance>
-          </service>
-      </services>
-    </data>
-
-  </configuration>
-</snapshot>
diff --git a/openflowplugin-controller-config/src/main/resources/initial/43-msg-spy.xml b/openflowplugin-controller-config/src/main/resources/initial/43-msg-spy.xml
deleted file mode 100644 (file)
index b420fa6..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<snapshot>
-  <required-capabilities>
-    <!-- openflowjava -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl?module=openflow-switch-connection-provider-impl&amp;revision=2014-03-28</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider?module=openflow-switch-connection-provider&amp;revision=2014-03-28</capability>
-    <!-- openflowplugin -->
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl?module=openflow-provider-impl&amp;revision=2014-03-26</capability>
-    <capability>urn:opendaylight:params:xml:ns:yang:openflow:common:config?module=openflow-provider&amp;revision=2014-03-26</capability>
-    <!-- binding-broker-impl - provided -->
-  </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:msgspy="urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl">msgspy:msg-spy-service-impl</type>
-            <name>msg-spy-service-impl</name>
-
-            <openflow-plugin-provider>
-                <type xmlns:opfprov="urn:opendaylight:params:xml:ns:yang:openflow:common:config">opfprov:openflow-provider</type>
-                <name>openflow-provider</name>
-            </openflow-plugin-provider>
-        </module>
-      </modules>
-
-      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <service>
-          <type xmlns:msgspy="urn:opendaylight:params:xml:ns:yang:openflow:common:config:impl">msgspy:msg-spy-service</type>
-          <instance>
-            <name>msg-spy-service</name>
-            <provider>/modules/module[type='msg-spy-service-impl'][name='msg-spy-service-impl']</provider>
-          </instance>
-        </service>
-      </services>
-    </data>
-
-  </configuration>
-</snapshot>
index 0c3e707f4dbb64559c412adc5b701b4964956efd..11072c60e69db56b60d8c69789630aefdb3a58ea 100644 (file)
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/sal</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>${config.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.mdsal</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${mdsal.model.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java
deleted file mode 100644 (file)
index b3096bb..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.config.openflow.plugin.impl.rev150327;
-
-import com.google.common.reflect.AbstractInvocationHandler;
-import com.google.common.reflect.Reflection;
-import java.lang.reflect.Method;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
-import org.opendaylight.openflowplugin.extension.api.OpenFlowPluginExtensionRegistratorProvider;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class OpenFlowProviderModule extends AbstractOpenFlowProviderModule {
-
-    private BundleContext bundleContext;
-
-    public OpenFlowProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public OpenFlowProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.config.openflow.plugin.impl.rev150327.OpenFlowProviderModule oldModule, final java.lang.AutoCloseable oldInstance) {
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // The service is provided via blueprint so wait for and return it here for backwards compatibility.
-        String typeFilter = String.format("(type=%s)", getIdentifier().getInstanceName());
-        final WaitingServiceTracker<OpenFlowPluginProvider> tracker = WaitingServiceTracker.create(
-                OpenFlowPluginProvider.class, bundleContext, typeFilter);
-        final OpenFlowPluginProvider openflowPluginProvider = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        // We don't want to call close on the actual service as its life cycle is controlled by blueprint but
-        // we do want to close the tracker so create a proxy to override close appropriately.
-        return Reflection.newProxy(OpenFlowPluginProviderProxyInterface.class, new AbstractInvocationHandler() {
-            @Override
-            protected Object handleInvocation(Object proxy, Method method, Object[] args) throws Throwable {
-                if (method.getName().equals("close")) {
-                    tracker.close();
-                    return null;
-                } else {
-                    return method.invoke(openflowPluginProvider, args);
-                }
-            }
-        });
-    }
-
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    @Override
-    public boolean canReuseInstance(AbstractOpenFlowProviderModule oldModule) {
-        return true;
-    }
-
-    private static interface OpenFlowPluginProviderProxyInterface extends OpenFlowPluginProvider,
-            OpenFlowPluginExtensionRegistratorProvider {
-    }
-}
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModuleFactory.java b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModuleFactory.java
deleted file mode 100644 (file)
index 454ba6b..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: openflow-plugin-provider-impl yang module local name: openflow-plugin-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Tue Mar 31 15:05:47 CEST 2015
-*
-* 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.config.openflow.plugin.impl.rev150327;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class OpenFlowProviderModuleFactory extends AbstractOpenFlowProviderModuleFactory {
-    @Override
-    public OpenFlowProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            OpenFlowProviderModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) {
-        OpenFlowProviderModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule,
-                oldInstance, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public OpenFlowProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        OpenFlowProviderModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}
diff --git a/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang b/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang
deleted file mode 100644 (file)
index 6c54e4d..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-module openflow-plugin-provider-impl {
-       yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:config:openflow:plugin:impl";
-    prefix "openflow-plugin-provider-impl";
-
-    import config {prefix config; revision-date 2013-04-05;}
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-    import openflow-provider {prefix openflow-provider; revision-date 2015-03-31;}
-    import openflow-switch-connection-provider {prefix openflow-switch-connection-provider;revision-date 2014-03-28;}
-    import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
-    import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28;}
-    import openflowplugin-extension-registry {prefix ofp-ext-reg; revision-date 2015-04-25;}
-    import opendaylight-entity-ownership-service { prefix ownership-service; revision-date 2015-08-10;}
-
-    description
-        "openflow-plugin-impl";
-
-    revision "2015-03-27" {
-        description
-            "Second openflow plugin implementation.";
-    }
-
-    typedef non-zero-uint32-type {
-        type uint32 {
-            range "1..max";
-        }
-    }
-
-    typedef non-zero-uint16-type {
-        type uint16 {
-            range "1..max";
-        }
-     }
-
-    identity openflow-plugin-provider-impl {
-        base config:module-type;
-        config:provided-service openflow-provider:openflow-provider;
-        config:provided-service ofp-ext-reg:openflow-extension-registry-provider;
-        config:java-name-prefix OpenFlowProvider;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case openflow-plugin-provider-impl {
-            when "/config:modules/config:module/config:type = 'openflow-plugin-provider-impl'";
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-async-data-broker;
-                    }
-                }
-            }
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-rpc-registry;
-                    }
-                }
-            }
-            container notification-adapter {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal-broker:binding-new-notification-service;
-                    }
-                }
-            }
-            container notification-publish-adapter {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal-broker:binding-new-notification-publish-service;
-                    }
-                }
-            }
-            container entity-ownership-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity ownership-service:entity-ownership-service;
-                    }
-                }
-            }
-            list openflow-switch-connection-provider {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity openflow-switch-connection-provider:openflow-switch-connection-provider;
-                    }
-                }
-            }
-            leaf rpc-requests-quota {
-                type uint32;
-                default 500;
-            }
-            leaf switch-features-mandatory {
-                type boolean;
-                default false;
-            }
-            leaf global-notification-quota {
-                type uint32;
-                default 131072;
-            }
-            leaf is-statistics-polling-on {
-                type boolean;
-                default "true";
-            }
-            leaf is-statistics-rpc-enabled {
-                status deprecated;
-                description "Exposing backward compatible statistics rpcs providing result in form of async notification";
-                type boolean;
-                default "false";
-            }
-            leaf barrier-interval-timeout-limit {
-                type non-zero-uint32-type;
-                default 500;
-            }
-            leaf barrier-count-limit {
-                type non-zero-uint16-type;
-                default 25600;
-            }
-            leaf echo-reply-timeout {
-                type non-zero-uint32-type;
-                default 2000;
-            }
-        }
-
-    }
-}
index f6f7f9e2948819ed23a01479f78945cf81441ce2..598b8298713fd7d63cdb463b3aa72201e580ffc7 100644 (file)
                         </goals>
                         <configuration>
                             <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>${project.build.directory}/generated-sources/config</outputBaseDir>
-                                    <additionalConfiguration>
-                                        <namespaceToPackage1>
-                                            urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang
-                                        </namespaceToPackage1>
-                                    </additionalConfiguration>
-                                </generator>
                                 <generator>
                                     <codeGeneratorClass>
                                         org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl
diff --git a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModule.java b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModule.java
deleted file mode 100644 (file)
index 3fd3e04..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: openflow-provider-impl  yang module local name: openflow-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 02 16:59:36 PDT 2014
-*
-* 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.openflow.common.config.impl.rev140326;
-
-import java.util.Collection;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider;
-import org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper;
-import org.opendaylight.openflowplugin.extension.api.ExtensionConverterRegistrator;
-import org.opendaylight.openflowplugin.openflow.md.core.sal.OpenflowPluginProvider;
-import org.osgi.framework.BundleContext;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public final class ConfigurableOpenFlowProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.common.config.impl.rev140326.AbstractConfigurableOpenFlowProviderModule {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ConfigurableOpenFlowProviderModule.class);
-
-    private BundleContext bundleContext;
-
-    /**
-     * @param identifier module identifier
-     * @param dependencyResolver dependency resolver
-     */
-    public ConfigurableOpenFlowProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    /**
-     * @param identifier module identifier
-     * @param dependencyResolver dependency resolver
-     * @param oldModule old module
-     * @param oldInstance old instance
-     */
-    public ConfigurableOpenFlowProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            ConfigurableOpenFlowProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    protected void customValidation() {
-        // Add custom validation for module attributes here.
-    }
-
-    @Override
-    public AutoCloseable createInstance() {
-        // The service is provided via blueprint so wait for and return it here for backwards compatibility.
-        String typeFilter = String.format("(type=%s)", getIdentifier().getInstanceName());
-        final WaitingServiceTracker<OpenflowPluginProvider> tracker = WaitingServiceTracker.create(
-                OpenflowPluginProvider.class, bundleContext, typeFilter);
-        final OpenflowPluginProvider actualService = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-
-        return new OpenflowPluginProvider() {
-            @Override
-            public void close() {
-                // Don't close the actual service as its life cycle is controlled by blueprint.
-                tracker.close();
-            }
-
-            @Override
-            public void initialization() {
-                actualService.initialization();
-            }
-
-            @Override
-            public void setSwitchConnectionProviders(Collection<SwitchConnectionProvider> switchConnectionProvider) {
-                actualService.setSwitchConnectionProviders(switchConnectionProvider);
-            }
-
-            @Override
-            public MessageCountDumper getMessageCountDumper() {
-                return actualService.getMessageCountDumper();
-            }
-
-            @Override
-            public ExtensionConverterRegistrator getExtensionConverterRegistrator() {
-                return actualService.getExtensionConverterRegistrator();
-            }
-
-            @Override
-            public void setRole(OfpRole role) {
-                actualService.setRole(role);
-            }
-
-            @Override
-            public void setSkipTableFeatures(Boolean skipTableFeatures) {
-                actualService.setSkipTableFeatures(skipTableFeatures);
-            }
-
-            @Override
-            public void fireRoleChange(OfpRole newRole) {
-                actualService.fireRoleChange(newRole);
-            }
-
-            @Override
-            public void setDataBroker(DataBroker dataBroker) {
-                actualService.setDataBroker(dataBroker);
-            }
-
-            @Override
-            public void setNotificationService(NotificationProviderService notificationService) {
-                actualService.setNotificationService(notificationService);
-            }
-
-            @Override
-            public void setRpcRegistry(RpcProviderRegistry rpcRegistry) {
-                actualService.setRpcRegistry(rpcRegistry);
-            }
-
-            @Override
-            public void setEntityOwnershipService(EntityOwnershipService entityOwnershipService) {
-                actualService.setEntityOwnershipService(entityOwnershipService);
-            }
-        };
-    }
-
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    @Override
-    public boolean canReuseInstance(AbstractConfigurableOpenFlowProviderModule oldModule) {
-        return true;
-    }
-
-}
diff --git a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModuleFactory.java b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/ConfigurableOpenFlowProviderModuleFactory.java
deleted file mode 100644 (file)
index 77f24c9..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-* Generated file
-
-* Generated from: yang module name: openflow-provider-impl  yang module local name: openflow-provider-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Apr 02 16:59:36 PDT 2014
-*
-* 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.openflow.common.config.impl.rev140326;
-
-import org.opendaylight.controller.config.api.DependencyResolver;
-import org.osgi.framework.BundleContext;
-
-/**
- * @deprecated Replaced by blueprint wiring
- */
-@Deprecated
-public class ConfigurableOpenFlowProviderModuleFactory extends AbstractConfigurableOpenFlowProviderModuleFactory {
-    @Override
-    public ConfigurableOpenFlowProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            ConfigurableOpenFlowProviderModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) {
-        ConfigurableOpenFlowProviderModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule,
-                oldInstance, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-
-    @Override
-    public ConfigurableOpenFlowProviderModule instantiateModule(String instanceName, DependencyResolver dependencyResolver,
-            BundleContext bundleContext) {
-        ConfigurableOpenFlowProviderModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext);
-        module.setBundleContext(bundleContext);
-        return module;
-    }
-}
diff --git a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java
deleted file mode 100644 (file)
index 8e1179b..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.common.config.impl.rev140326;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import org.opendaylight.openflowplugin.openflow.md.core.sal.OpenflowPluginProvider;
-import org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper;
-import org.opendaylight.openflowplugin.api.openflow.statistics.MessageObservatory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * MsgSpyServiceModul implements and register own MsgSpyServiceRuntimeMXBean
- * which is linked to {@link MessageObservatory} from {@link OpenflowPluginProvider}
- *
- * @author <a href="mailto:vdemcak@cisco.com">Vaclav Demcak</a>
- *
- */
-public class MsgSpyServiceModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.common.config.impl.rev140326.AbstractMsgSpyServiceModule {
-    private static final Logger log = LoggerFactory.getLogger(MsgSpyServiceModule.class);
-
-    private static final SimpleDateFormat ft = new SimpleDateFormat ("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
-
-    public MsgSpyServiceModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-
-        super(identifier, dependencyResolver);
-    }
-
-    public MsgSpyServiceModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
-            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            final MsgSpyServiceModule oldModule, final java.lang.AutoCloseable oldInstance) {
-
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
-
-    @Override
-    public void customValidation() {
-        // No need to validate dependencies, since all dependencies are mandatory
-        // config-subsystem will perform the validation
-    }
-
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        final MessageCountDumper msg = getOpenflowPluginProviderDependency().getMessageCountDumper();
-
-        /* Internal MXBean implementation -> make statMsg from dumpMessageCounst only yet */
-        final MsgSpyServiceRuntimeMXBean msgSpyBean = new MsgSpyServiceRuntimeMXBean() {
-
-            @Override
-            public String makeMsgStatistics() {
-                if (msg == null) {
-                    return "Message Spy Count Dumper is not avaliable.";
-                }
-                List<String> statList = msg.dumpMessageCounts();
-
-                StringBuilder strBuilder = new StringBuilder(ft.format(System.currentTimeMillis()));
-                for (String stat : statList) {
-                    strBuilder.append("\n").append(stat);
-                }
-                return strBuilder.toString();
-            }
-
-            @Override
-            public String getMsgStatistics() {
-                return makeMsgStatistics();
-            }
-        };
-
-        /* MXBean registration */
-        final MsgSpyServiceRuntimeRegistration runtimeReg =
-                getRootRuntimeBeanRegistratorWrapper().register(msgSpyBean);
-
-        /* Internal MsgSpyService implementation */
-        final class AutoClosableMsgSpyService implements MessageCountDumper, AutoCloseable {
-
-            @Override
-            public void close() {
-                if (runtimeReg != null) {
-                    try {
-                        runtimeReg.close();
-                    }
-                    catch (Exception e) {
-                        String errMsg = "Error by stop MsgSpyService.";
-                        log.error(errMsg, e);
-                        throw new IllegalStateException(errMsg, e);
-                    }
-                }
-                log.info(" Msg Stat Service consumer (instance {} turn down.)", this);
-            }
-
-            @Override
-            public List<String> dumpMessageCounts() {
-                return msg.dumpMessageCounts();
-            }
-        }
-
-        AutoCloseable ret = new AutoClosableMsgSpyService();
-        log.info("MsgStatService (instance {}) initialized.", ret);
-        return ret;
-    }
-
-}
diff --git a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModuleFactory.java b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModuleFactory.java
deleted file mode 100644 (file)
index 91c5a29..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: openflow-provider-impl yang module local name: msg-spy-service-impl
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jul 04 09:53:32 CEST 2014
-*
-* 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.openflow.common.config.impl.rev140326;
-public class MsgSpyServiceModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.common.config.impl.rev140326.AbstractMsgSpyServiceModuleFactory {
-
-}
diff --git a/pom.xml b/pom.xml
index fb637317e56bd263b3ad7d66d3ce38877cce4838..946aac6f3d735a162b8ed7b77aa5ac33bbcaddb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-aggregator</artifactId>
     <version>0.5.0-SNAPSHOT</version>
     <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
       <module>openflowplugin-common</module>
       <module>extension</module>
       <module>distribution/karaf</module>
-      <module>openflowplugin-controller-config</module>
       <module>openflowplugin-blueprint-config</module>
-      <!--
-      <module>openflowplugin-it</module>
-      -->
+      <!-- <module>openflowplugin-it</module> -->
       <module>test-provider</module>
       <module>drop-test-karaf</module>
       <module>test-common</module>
diff --git a/src/test/resources/controller.xml b/src/test/resources/controller.xml
deleted file mode 100644 (file)
index e69de29..0000000