Merge "Add VTN Coordinator tarball to the Virtualization Edition."

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index b5b6a2ba16ccec144adbe85e487619014e02ff88..4d68bfba7ccde4559a23c3b5ce659f8a1e499594 100644 (file)
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -33,6 +33,11 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <artifactId>ovsdb</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>ovsdb.northbound</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-bgpcep.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-bgpcep.conf
deleted file mode 100644 (file)
index 981d96c..0000000
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-bgpcep.conf
+++ /dev/null
@@ -1,180 +0,0 @@
-//MODULES START
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:programming:impl">prefix:instruction-scheduler-impl</type>
-               <name>global-instruction-scheduler</name>
-               <notification-service>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                       <name>ref_binding-notification-broker</name>
-               </notification-service>
-               <rpc-registry>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                       <name>ref_binding-rpc-broker</name>
-               </rpc-registry>
-               <timer>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                       <name>global-timer</name>
-               </timer>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">prefix:bgp-extensions-impl</type>
-               <name>global-bgp-extensions</name>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-parser</type>
-               <name>base-bgp-parser</name>
-               <bgp-extensions>
-                       <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-                       <name>global-bgp-extensions</name>
-               </bgp-extensions>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">prefix:bgp-rib-extensions-impl</type>
-               <name>global-rib-extensions</name>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate">prefix:bgp-linkstate</type>
-               <name>bgp-linkstate</name>
-               <bgp-extensions>
-                       <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-                       <name>global-bgp-extensions</name>
-               </bgp-extensions>
-               <rib-extensions>
-                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-                       <name>global-rib-extensions</name>
-               </rib-extensions>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher-impl</type>
-               <name>global-bgp-dispatcher</name>
-               <bgp-extensions>
-                       <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-                       <name>global-bgp-extensions</name>
-               </bgp-extensions>
-               <boss-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-boss-group</name>
-               </boss-group>
-               <worker-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-worker-group</name>
-               </worker-group>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">prefix:pcep-extensions-impl</type>
-               <name>global-pcep-extensions</name>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-session-proposal-factory-impl</type>
-               <name>global-pcep-session-proposal-factory</name>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-dispatcher-impl</type>
-               <name>global-pcep-dispatcher</name>
-               <extensions>
-                       <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
-                       <name>global-pcep-extensions</name>
-               </extensions>
-               <pcep-session-proposal-factory>
-                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
-                       <name>global-pcep-session-proposal-factory</name>
-               </pcep-session-proposal-factory>
-               <boss-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-boss-group</name>
-               </boss-group>
-               <worker-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-worker-group</name>
-               </worker-group>
-               <timer>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                       <name>global-timer</name>
-               </timer>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">prefix:pcep-topology-impl</type>
-               <name>pcep-topology</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>ref_binding-data-broker</name>
-               </data-provider>
-               <dispatcher>
-                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
-                       <name>pcep-dispatcher</name>
-               </dispatcher>
-               <rpc-registry>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                       <name>ref_binding-rpc-broker</name>
-               </rpc-registry>
-               <scheduler>
-                       <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">pgmspi:instruction-scheduler</type>
-                       <name>global-instruction-scheduler</name>
-               </scheduler>
-               <topology-id>pcep-topology</topology-id>
-       </module>
-//SERVICES START
-       <service>
-               <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">pgmspi:instruction-scheduler</type>
-               <instance>
-                       <name>global-instruction-scheduler</name>
-                       <provider>/config/modules/module[name='instruction-scheduler-impl']/instance[name='global-instruction-scheduler']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-               <instance>
-                       <name>global-bgp-extensions</name>
-                       <provider>/config/modules/module[name='bgp-extensions-impl']/instance[name='global-bgp-extensions']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-               <instance>
-                       <name>global-rib-extensions</name>
-                       <provider>/config/modules/module[name='bgp-rib-extensions-impl']/instance[name='global-rib-extensions']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
-               <instance>
-                       <name>global-bgp-dispatcher</name>
-                       <provider>/config/modules/module[name='bgp-dispatcher-impl']/instance[name='global-bgp-dispatcher']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
-               <instance>
-                       <name>global-pcep-extensions</name>
-                       <provider>/config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
-               <instance>
-                       <name>global-pcep-session-proposal-factory</name>
-                       <provider>/config/modules/module[name='pcep-session-proposal-factory-impl']/instance[name='global-pcep-session-proposal-factory']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
-               <instance>
-                       <name>global-pcep-dispatcher</name>
-                       <provider>/config/modules/module[name='pcep-dispatcher-impl']/instance[name='global-pcep-dispatcher']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">pcep:pcep-topology</type>
-               <instance>
-                       <name>pcep-topology</name>
-                       <provider>/config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology']</provider>
-               </instance>
-       </service>
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=config-bgp-parser-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
-urn:opendaylight:params:xml:ns:yang:controller:pcep:impl?module=odl-pcep-impl-cfg&revision=2013-06-27
-urn:opendaylight:params:xml:ns:yang:controller:pcep:spi?module=config-pcep-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider?module=config-pcep-topology-provider&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:programming:impl?module=config-programming-impl&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&revision=2013-11-15

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
new file mode 100644 (file)
index 0000000..8ca07b7
--- /dev/null
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
@@ -0,0 +1,30 @@
+//MODULES START
+        <module>
+                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:programming:impl">prefix:instruction-scheduler-impl</type>
+                <name>global-instruction-scheduler</name>
+               <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>
+               <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>
+               <timer>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
+                       <name>global-timer</name>
+               </timer>
+        </module>
+//SERVICES START
+        <service>
+                <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
+                <instance>
+                        <name>global-instruction-scheduler</name>
+                        <provider>/modules/module[type='instruction-scheduler-impl'][name='global-instruction-scheduler']</provider>
+                </instance>
+        </service>
+//CAPABILITIES START
+urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
+urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
+urn:opendaylight:params:xml:ns:yang:controller:programming:impl?module=config-programming-impl&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&revision=2013-11-15

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf
new file mode 100644 (file)
index 0000000..0bcab15
--- /dev/null
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf
@@ -0,0 +1,103 @@
+//MODULES START
+        <module>
+                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">prefix:bgp-extensions-impl</type>
+                <name>global-bgp-extensions</name>
+               <extension>
+                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                        <name>base-bgp-parser</name>
+               </extension>
+               <extension>
+                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                        <name>bgp-linkstate</name>
+               </extension>
+        </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-parser</type>
+               <name>base-bgp-parser</name>
+       </module>
+        <module>
+                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">prefix:bgp-rib-extensions-impl</type>
+                <name>global-rib-extensions</name>
+               <extension>
+                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                       <name>base-bgp-rib</name>
+               </extension>
+               <extension>
+                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                       <name>bgp-linkstate</name>
+               </extension>
+        </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-rib</type>
+               <name>base-bgp-rib</name>
+       </module>
+        <module>
+                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate">prefix:bgp-linkstate</type>
+                <name>bgp-linkstate</name>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher-impl</type>
+               <name>global-bgp-dispatcher</name>
+               <bgp-extensions>
+                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
+                        <name>global-bgp-extensions</name>
+               </bgp-extensions>
+               <boss-group>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                       <name>global-boss-group</name>
+               </boss-group>
+               <worker-group>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                       <name>global-worker-group</name>
+               </worker-group>
+       </module>
+//SERVICES START
+        <service>
+                <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
+                <instance>
+                        <name>global-bgp-extensions</name>
+                        <provider>/modules/module[type='bgp-extensions-impl'][name='global-bgp-extensions']</provider>
+                </instance>
+        </service>
+        <service>
+                <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                <instance>
+                        <name>base-bgp-parser</name>
+                        <provider>/modules/module[type='base-bgp-parser'][name='base-bgp-parser']</provider>
+               </instance>
+               <instance>
+                        <name>bgp-linkstate</name>
+                        <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
+                </instance>
+        </service>
+        <service>
+               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                <instance>
+                        <name>base-bgp-rib</name>
+                        <provider>/modules/module[type='base-bgp-rib'][name='base-bgp-rib']</provider>
+               </instance>
+               <instance>
+                        <name>bgp-linkstate</name>
+                        <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
+                </instance>
+       </service>
+        <service>
+                <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
+                <instance>
+                        <name>global-rib-extensions</name>
+                        <provider>/modules/module[type='bgp-rib-extensions-impl'][name='global-rib-extensions']</provider>
+                </instance>
+        </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
+               <instance>
+                       <name>global-bgp-dispatcher</name>
+                        <provider>/modules/module[type='bgp-dispatcher-impl'][name='global-bgp-dispatcher']</provider>
+               </instance>
+       </service>
+//CAPABILITIES START
+urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=config-bgp-parser-spi&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&revision=2013-04-09
+urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
+urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf
new file mode 100644 (file)
index 0000000..1f78e29
--- /dev/null
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf
@@ -0,0 +1,117 @@
+//MODULES START
+        <module>
+                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">prefix:pcep-extensions-impl</type>
+                <name>global-pcep-extensions</name>
+               <extension>
+                       <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
+                       <name>pcep-parser-base</name>
+               </extension>
+               <extension>
+                       <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
+                       <name>pcep-parser-crabbe-initiated</name>
+               </extension>
+        </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-base</type>
+               <name>pcep-parser-base</name>
+        </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-crabbe-initiated</type>
+               <name>pcep-parser-crabbe-initiated</name>
+        </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-session-proposal-factory-impl</type>
+               <name>global-pcep-session-proposal-factory</name>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-dispatcher-impl</type>
+               <name>global-pcep-dispatcher</name>
+               <pcep-extensions>
+                       <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
+                       <name>global-pcep-extensions</name>
+               </pcep-extensions>
+               <pcep-session-proposal-factory>
+                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
+                       <name>global-pcep-session-proposal-factory</name>
+               </pcep-session-proposal-factory>
+               <boss-group>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                       <name>global-boss-group</name>
+               </boss-group>
+               <worker-group>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                       <name>global-worker-group</name>
+               </worker-group>
+               <timer>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
+                       <name>global-timer</name>
+               </timer>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">prefix:pcep-topology-provider</type>
+               <name>pcep-topology</name>
+               <data-provider>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                       <name>binding-data-broker</name>
+               </data-provider>
+               <dispatcher>
+                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
+                       <name>global-pcep-dispatcher</name>
+               </dispatcher>
+               <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>
+               <scheduler>
+                       <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
+                        <name>global-instruction-scheduler</name>
+               </scheduler>
+               <topology-id>pcep-topology</topology-id>
+       </module>
+//SERVICES START
+        <service>
+                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
+                <instance>
+                        <name>global-pcep-extensions</name>
+                        <provider>/config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions']</provider>
+                </instance>
+        </service>
+        <service>
+                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
+                <instance>
+                        <name>pcep-parser-base</name>
+                        <provider>/config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base']</provider>
+                </instance>
+                <instance>
+                        <name>pcep-parser-crabbe-initiated</name>
+                        <provider>/config/modules/module[name='pcep-parser-crabbe-initiated']/instance[name='pcep-parser-crabbe-initiated']</provider>
+                </instance>
+        </service>
+       <service>
+               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
+               <instance>
+                       <name>global-pcep-session-proposal-factory</name>
+                       <provider>/config/modules/module[name='pcep-session-proposal-factory-impl']/instance[name='global-pcep-session-proposal-factory']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
+               <instance>
+                       <name>global-pcep-dispatcher</name>
+                       <provider>/config/modules/module[name='pcep-dispatcher-impl']/instance[name='global-pcep-dispatcher']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">pcep:pcep-topology-reference</type>
+               <instance>
+                       <name>pcep-topology</name>
+                       <provider>/config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology']</provider>
+               </instance>
+       </service>
+//CAPABILITIES START
+urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
+urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
+urn:opendaylight:params:xml:ns:yang:controller:pcep:impl?module=odl-pcep-impl-cfg&revision=2013-06-27
+urn:opendaylight:params:xml:ns:yang:controller:pcep:spi?module=config-pcep-spi&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider?module=config-pcep-topology-provider&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&revision=2013-11-15

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf
new file mode 100644 (file)
index 0000000..7f3fb0a
--- /dev/null
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf
@@ -0,0 +1,155 @@
+//MODULES START
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal-impl</type>
+               <name>example-bgp-proposal</name>
+               <as-number>64496</as-number>
+               <bgp-id>192.0.2.2</bgp-id>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-impl</type>
+               <name>example-bgp-peer</name>
+               <bgp-dispatcher>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
+                       <name>global-bgp-dispatcher</name>
+               </bgp-dispatcher>
+               <bgp-proposal>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
+                       <name>example-bgp-proposal</name>
+               </bgp-proposal>
+               <host>route-reflector.example.org</host>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:timed-reconnect-strategy</type>
+               <name>example-reconnect-strategy</name>
+               <min-sleep>1000</min-sleep>
+               <max-sleep>180000</max-sleep>
+               <sleep-factor>2.00</sleep-factor>
+               <connect-time>5000</connect-time>
+               <executor>
+                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
+                       <name>global-event-executor</name>
+               </executor>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-impl</type>
+               <name>example-bgp-rib</name>
+               <bgp>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
+                       <name>example-bgp-peer</name>
+               </bgp>
+               <extensions>
+                        <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
+                        <name>global-rib-extensions</name>
+               </extensions>
+               <data-provider>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                       <name>binding-data-broker</name>
+               </data-provider>
+               <session-reconnect-strategy>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+                       <name>example-reconnect-strategy</name>
+               </session-reconnect-strategy>
+               <tcp-reconnect-strategy>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+                       <name>example-reconnect-strategy</name>
+               </tcp-reconnect-strategy>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
+               <name>example-ipv4-topology</name>
+               <data-provider>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                       <name>binding-data-broker</name>
+               </data-provider>
+               <local-rib>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                       <name>example-bgp-rib</name>
+               </local-rib>
+               <topology-id>example-ipv4-topology</topology-id>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
+               <name>example-ipv6-topology</name>
+               <data-provider>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                       <name>binding-data-broker</name>
+               </data-provider>
+               <local-rib>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                       <name>example-bgp-rib</name>
+               </local-rib>
+               <topology-id>example-ipv6-topology</topology-id>
+       </module>
+       <module>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-linkstate-topology</type>
+               <name>example-linkstate-topology</name>
+               <data-provider>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                       <name>binding-data-broker</name>
+               </data-provider>
+               <local-rib>
+                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                       <name>example-bgp-rib</name>
+               </local-rib>
+               <topology-id>example-linkstate-topology</topology-id>
+       </module>
+//SERVICES START
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
+               <instance>
+                       <name>example-bgp-proposal</name>
+                        <provider>/config/modules/module[name='bgp-proposal-impl']/instance[name='example-bgp-proposal']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
+               <instance>
+                       <name>example-bgp-peer</name>
+                        <provider>/config/modules/module[name='bgp-impl']/instance[name='example-bgp-peer']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+               <instance>
+                       <name>example-reconnect-strategy</name>
+                       <provider>/config/modules/module[name='timed-reconnect-strategy']/instance[name='example-reconnect-strategy']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+               <instance>
+                       <name>example-ipv4-topology</name>
+                       <provider>/config/modules/module[name='bgp-reachability-ipv4']/instance[name='example-ipv4-topology']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+               <instance>
+                       <name>example-bgp-rib</name>
+                       <provider>/config/modules/module[name='rib-impl']/instance[name='example-bgp-rib']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+               <instance>
+                       <name>example-ipv6-topology</name>
+                       <provider>/config/modules/module[name='bgp-reachability-ipv6']/instance[name='example-ipv6-topology']</provider>
+               </instance>
+       </service>
+       <service>
+               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+               <instance>
+                       <name>example-linkstate-topology</name>
+                       <provider>/config/modules/module[name='bgp-linkstate-topology']/instance[name='example-linkstate-topology']</provider>
+               </instance>
+       </service>
+//CAPABILITIES START
+urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg?module=config-bgp-rib&revision=2013-07-01
+urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&revision=2013-04-09
+urn:opendaylight:params:xml:ns:yang:controller:bgp:listener?module=bgp-listener&revision=2013-04-09
+urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider?module=config-bgp-topology-provider&revision=2013-11-15
+urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
+urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
+urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy?module=reconnect-strategy&revision=2013-11-09
+urn:opendaylight:params:xml:ns:yang:controller:topology?module=config-topology-api&revision=2013-11-15

diff --git a/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
index 66c4dcfd4d57baac9b8216b5962ba73e9f688f78..65859b89b5b5fb8466b41204ecdf7c71b95fb427 100644 (file)
--- a/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@ -35,8 +35,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
     <!-- ovsdb --> 
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <artifactId>ovsdb.neutron</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
 
     <!-- vtn -->

diff --git a/distributions/virtualization/src/assemble/bin.xml b/distributions/virtualization/src/assemble/bin.xml
index 9bf1c7b3bda05d73a80551e46083abb7a4245156..ecd1bd7f7a68bfd6f4b14475c0444c923fd35299 100644 (file)
--- a/distributions/virtualization/src/assemble/bin.xml
+++ b/distributions/virtualization/src/assemble/bin.xml
@@ -12,8 +12,24 @@
     <fileSet>
       <directory>${project.build.directory}/generated-resources</directory>
       <outputDirectory>/</outputDirectory>
+      <excludes>
+          <exclude>opendaylight/run.sh</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>${project.build.directory}/generated-resources/opendaylight/run.sh</source>
+      <outputDirectory>/opendaylight/</outputDirectory>
+      <destName>run.base.sh</destName>
+      <fileMode>0755</fileMode>
+    </file>
+    <file>
+      <source>${basedir}/src/assemble/resources/run.sh</source>
+      <outputDirectory>/opendaylight/</outputDirectory>
+      <fileMode>0755</fileMode>
+    </file>
+  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory>opendaylight/plugins</outputDirectory>

diff --git a/distributions/virtualization/src/assemble/resources/run.sh b/distributions/virtualization/src/assemble/resources/run.sh
new file mode 100755 (executable)
index 0000000..6d04057
--- /dev/null
+++ b/distributions/virtualization/src/assemble/resources/run.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+function usage {
+    echo "Please select one of the 3 supported Virtualization technology : \"$0 -virt [ovsdb | opendove | vtn]\""
+    exit 1
+}
+
+virtIndex=0
+while true ; do
+    (( i += 1 ))
+    case "${@:$i:1}" in
+        -virt) virtIndex=$i ;;
+        "") break ;;
+    esac
+done
+
+# Virtualization edition select
+if [ ${virtIndex} -eq 0 ]; then
+    usage
+fi
+
+virt=${@:$virtIndex+1:1}
+if [ "${virt}" == "" ]; then
+    usage
+else
+    if [ "${virt}" == "ovsdb" ]; then
+        ODL_VIRT_FILTER="opendove|vtn"
+    elif [ "${virt}" == "opendove" ]; then
+        ODL_VIRT_FILTER="ovsdb|vtn"
+    elif [ "${virt}" == "vtn" ]; then
+        ODL_VIRT_FILTER="opendove|ovsdb"
+    else
+        usage
+    fi
+fi
+
+./run.base.sh -Dfelix.fileinstall.filter="^(?!org.opendaylight.(${ODL_VIRT_FILTER})).*" "${@:1:$virtIndex-1}" "${@:virtIndex+2}"