Merge " Added new feature *odl-ovsdb-openstack-clusteraware*."

diff --combined features/pom.xml
index e85dcea5750b73a3b8050142460d2d164bb59edd,533e7be56b3f8d5e2fbb31b0731d4f44fed9ab68..8b00cff0d62bd26a9c5d55d226840583210c058e
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -47,8 -47,6 +47,8 @@@ and is available at http://www.eclipse.
    <properties>
      <odl.karaf.base.version>1.6.0-SNAPSHOT</odl.karaf.base.version>
      <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
 +    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
 +    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
      <neutron.version>0.6.0-SNAPSHOT</neutron.version>
      <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
      <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
@@@ -81,22 -79,6 +81,22 @@@
        <type>xml</type>
        <classifier>features</classifier>
      </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.mdsal.model</groupId>
 +      <artifactId>features-mdsal-model</artifactId>
 +      <version>${mdsal.model.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +      <scope>runtime</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.netconf</groupId>
 +      <artifactId>features-restconf</artifactId>
 +      <version>${restconf.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +      <scope>runtime</scope>
 +    </dependency>
      <!-- external dependencies -->
      <!-- TODO clean up based on what is provided by odlparent -->
      <dependency>
@@@ -237,6 -219,23 +237,23 @@@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
+ 
+     <!-- openflowplugin dependencies for net-virt clustering-->
+     <dependency>
+       <groupId>org.opendaylight.openflowplugin</groupId>
+       <artifactId>features-openflowplugin-li</artifactId>
+       <version>${openflowplugin.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.openflowplugin</groupId>
+       <artifactId>features-openflowplugin-extension-li</artifactId>
+       <version>${openflowplugin.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
+ 
      <!-- project specific dependencies -->
      <dependency>
        <groupId>${project.groupId}</groupId>
@@@ -301,23 -300,6 +318,23 @@@
        <type>xml</type>
        <classifier>features</classifier>
      </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>netvirt-api</artifactId>
 +      <version>${project.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>hwgw</artifactId>
 +      <version>${project.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>hwvtepsouthbound-features</artifactId>
 +      <version>${project.version}</version>
 +      <type>xml</type>
 +      <classifier>features</classifier>
 +    </dependency>
      <!-- DLUX dependency for the UI -->
      <dependency>
        <groupId>org.opendaylight.dlux</groupId>

diff --combined features/src/main/features/features.xml
index 466fecd57822e921e09aa6d77fed6209bddc4772,51319934b64a45b496036f23f07f3928190a02f9..84371f2fb542a3e4b2f32ba623bc32b46a24b62a
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -4,14 -4,13 +4,16 @@@
            xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/{{VERSION}}/xml/features</repository>
    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/{{VERSION}}/xml/features</repository>
+   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension-li/{{VERSION}}/xml/features</repository>
+   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/{{VERSION}}/xml/features</repository>
    <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
    <repository>mvn:org.opendaylight.ovsdb/southbound-features/1.2.1-SNAPSHOT/xml/features</repository>
    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
    <repository>mvn:org.opendaylight.ovsdb/library-features/{{VERSION}}/xml/features</repository>
    <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
 +  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
 +  <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
 +  <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/{{VERSION}}/xml/features</repository>
  
    <feature name="odl-ovsdb-all" description="OpenDaylight :: OVSDB :: all"
             version='${project.version}'>
@@@ -48,27 -47,28 +50,47 @@@
      <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
      <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
    </feature>
+ 
+   <feature name="odl-ovsdb-openstack-clusteraware" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization - Cluster Aware"
+            version='${project.version}'>
+     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model-li</feature>
+     <feature version="${neutron.version}">odl-neutron-service</feature>
+     <feature version="${project.version}">odl-ovsdb-southbound-impl-ui</feature>
+     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services-li</feature>
+     <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions-li</feature>
+     <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.ovsdb/utils.neutron-utils/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}</bundle>
+     <bundle>mvn:org.opendaylight.neutron/dummyprovider/{{VERSION}}</bundle>
+     <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
+     <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
+   </feature>
+ 
    <feature name="odl-ovsdb-ui" description="OpenDaylight :: OVSDB :: DLUX Integration Plugin" version='${project.version}'>
      <feature version="${dlux.version}">odl-dlux-core</feature>
      <bundle>mvn:org.opendaylight.ovsdb/ovsdb-ui-bundle/{{VERSION}}</bundle>
    </feature>
 +  <feature name='odl-netvirt-api' version='${project.version}' description='OpenDaylight :: netvirt :: api'>
 +    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
 +    <bundle>mvn:org.opendaylight.ovsdb/netvirt-api/{{VERSION}}</bundle>
 +  </feature>
 +  <feature name='odl-netvirt-rest' version='${project.version}' description='OpenDaylight :: netvirt :: REST'>
 +    <feature version="${project.version}">odl-netvirt-api</feature>
 +    <feature version="${restconf.version}">odl-restconf</feature>
 +  </feature>
 +  <feature name='odl-netvirt-ui' version='${project.version}' description='OpenDaylight :: netvirt :: UI'>
 +    <feature version="${project.version}">odl-netvirt-rest</feature>
 +    <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
 +    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
 +  </feature>
 +  <feature name='odl-netvirt-hwgw' version='${project.version}' description='OpenDaylight :: netvirt :: Hardware Gateway'>
 +    <feature version="${project.version}">odl-netvirt-api</feature>
 +    <feature version='${project.version}'>odl-ovsdb-hwvtepsouthbound</feature>
 +    <bundle>mvn:org.opendaylight.ovsdb/hwgw/{{VERSION}}</bundle>
 +  </feature>
 +
  </features>