Adding ofextensions/circuitsw features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/circuitsw-merge-beryllium/
2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=ofextensions/circuitsw.git;a=blob;f=features/src/main/features/features.xml
        a) Feature Names: Prefixed with 'odl-' : odl-circuitsw-switch, odl-circuitsw-switch-ui, odl-circuitsw-switch-rest
        b) Feature Descriptions: Present
        c) Features Start-Levels: N/A
3) Features Tested: Features have been tested for functionality with
        a) feature:install odl-circuitsw-switch odl-circuitsw-switch-rest odl-circuitsw-switch-ui
        b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact - None

Change-Id: I6c95f9b337d1e73c3e7a5e1a3ceadd7221d84859
Signed-off-by: Aneesha Pailla <apailla@calient.net>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 2001dd9c0b9ea8ad782a76340931654b8a99b3ec..b21b44712cf5e636bda5a2cfd6dc9230f3f28e4a 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -240,6 +240,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
+      <artifactId>circuitsw-features</artifactId>
+      <version>${feature.circuitsw.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index f7263c71a2dc98cf707feb648d989e82e62f9bc1..c8296c784af002cfd373b68ca6c5d17bc4d25cbb 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -61,6 +61,7 @@
     <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index d20b32dc44e166519217c0a7fe97627022a9a863..96f93a9add57fd5686bd7d46252508c56b122c29 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -72,6 +72,9 @@
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
         <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
+        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
+        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
+        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
         <feature version='${didm.version}'>odl-didm-identification-api</feature>
         <feature version='${didm.version}'>odl-didm-identification</feature>
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>

diff --git a/pom.xml b/pom.xml
index fdc10734424f2c4ff4326c5ee92b5940442caf42..5ee01a9b5ffdaa0ce2f9374b9b8485baf7e8ec9e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
     <feature.armoury.version>1.0.0-SNAPSHOT</feature.armoury.version>
     <feature.bgpcep.version>0.5.0-SNAPSHOT</feature.bgpcep.version>
     <feature.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>
+    <feature.circuitsw.version>1.0.0-SNAPSHOT</feature.circuitsw.version>
     <feature.coretutorials.version>1.1.0-SNAPSHOT</feature.coretutorials.version>
     <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>
     <feature.faas.version>1.0.0-SNAPSHOT</feature.faas.version>