From: Robert Varga Date: Fri, 13 Dec 2013 07:59:29 +0000 (+0100) Subject: BUG-242: extract configuration files from project-provided artifacts X-Git-Tag: jenkins-integration-bulk-release-prepare-only-1~62 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F3690%2F1;p=integration.git BUG-242: extract configuration files from project-provided artifacts Change-Id: I05f682a962377943ae0a7f654e2b1df37d3a5c74 Signed-off-by: Robert Varga --- diff --git a/distributions/serviceprovider/pom.xml b/distributions/serviceprovider/pom.xml index 28d80d3b..5f2a2627 100644 --- a/distributions/serviceprovider/pom.xml +++ b/distributions/serviceprovider/pom.xml @@ -267,6 +267,11 @@ http://maven.apache.org/maven-v4_0_0.xsd"> bgp-util ${bgpcep.bgp.version} + + org.opendaylight.bgpcep + bgp-controller-config + ${bgpcep.bgp.version} + @@ -436,41 +451,45 @@ http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.maven.plugins maven-resources-plugin 2.6 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 - generate-resources - copy-resources + unpack-shared-resources - copy-resources + unpack-dependencies + generate-resources ${project.build.directory}/generated-resources - - - ${basedir}/src/main/resources - - + distributions-base + org.opendaylight.integration + true + false - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - + - unpack-shared-resources + unpack-provided-configs unpack-dependencies generate-resources - ${project.build.directory}/generated-resources - distributions-base - org.opendaylight.integration - true - false + ${project.build.directory}/provided-configs + + bgp-controller-config, + pcep-controller-config, + programming-controller-config, + + + org.opendaylight.bgpcep, + + true + false diff --git a/distributions/serviceprovider/src/assemble/bin.xml b/distributions/serviceprovider/src/assemble/bin.xml index 0b065b43..fe488619 100644 --- a/distributions/serviceprovider/src/assemble/bin.xml +++ b/distributions/serviceprovider/src/assemble/bin.xml @@ -15,6 +15,13 @@ ${project.build.directory}/generated-resources / + + ${project.build.directory}/provided-configs + /opendaylight/configuration + + META-INF + + 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 deleted file mode 100644 index 8ca07b77..00000000 --- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf +++ /dev/null @@ -1,30 +0,0 @@ -//MODULES START - - prefix:instruction-scheduler-impl - global-instruction-scheduler - - binding:binding-notification-service - binding-notification-broker - - - binding:binding-rpc-registry - binding-rpc-broker - - - netty:netty-timer - global-timer - - -//SERVICES START - - pgmspi:instruction-scheduler - - global-instruction-scheduler - /modules/module[type='instruction-scheduler-impl'][name='global-instruction-scheduler'] - - -//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 deleted file mode 100644 index 0bcab15e..00000000 --- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf +++ /dev/null @@ -1,103 +0,0 @@ -//MODULES START - - prefix:bgp-extensions-impl - global-bgp-extensions - - bgpspi:extension - base-bgp-parser - - - bgpspi:extension - bgp-linkstate - - - - prefix:base-bgp-parser - base-bgp-parser - - - prefix:bgp-rib-extensions-impl - global-rib-extensions - - ribspi:extension - base-bgp-rib - - - ribspi:extension - bgp-linkstate - - - - prefix:base-bgp-rib - base-bgp-rib - - - prefix:bgp-linkstate - bgp-linkstate - - - prefix:bgp-dispatcher-impl - global-bgp-dispatcher - - bgpspi:extensions - global-bgp-extensions - - - netty:netty-threadgroup - global-boss-group - - - netty:netty-threadgroup - global-worker-group - - -//SERVICES START - - bgpspi:extensions - - global-bgp-extensions - /modules/module[type='bgp-extensions-impl'][name='global-bgp-extensions'] - - - - bgpspi:extension - - base-bgp-parser - /modules/module[type='base-bgp-parser'][name='base-bgp-parser'] - - - bgp-linkstate - /modules/module[type='bgp-linkstate'][name='bgp-linkstate'] - - - - ribspi:extension - - base-bgp-rib - /modules/module[type='base-bgp-rib'][name='base-bgp-rib'] - - - bgp-linkstate - /modules/module[type='bgp-linkstate'][name='bgp-linkstate'] - - - - ribspi:extensions - - global-rib-extensions - /modules/module[type='bgp-rib-extensions-impl'][name='global-rib-extensions'] - - - - prefix:bgp-dispatcher - - global-bgp-dispatcher - /modules/module[type='bgp-dispatcher-impl'][name='global-bgp-dispatcher'] - - -//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 deleted file mode 100644 index 1f78e290..00000000 --- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf +++ /dev/null @@ -1,117 +0,0 @@ -//MODULES START - - prefix:pcep-extensions-impl - global-pcep-extensions - - pcepspi:extension - pcep-parser-base - - - pcepspi:extension - pcep-parser-crabbe-initiated - - - - prefix:pcep-parser-base - pcep-parser-base - - - prefix:pcep-parser-crabbe-initiated - pcep-parser-crabbe-initiated - - - prefix:pcep-session-proposal-factory-impl - global-pcep-session-proposal-factory - - - prefix:pcep-dispatcher-impl - global-pcep-dispatcher - - pcepspi:extensions - global-pcep-extensions - - - pcep:pcep-session-proposal-factory - global-pcep-session-proposal-factory - - - netty:netty-threadgroup - global-boss-group - - - netty:netty-threadgroup - global-worker-group - - - netty:netty-timer - global-timer - - - - prefix:pcep-topology-provider - pcep-topology - - binding:binding-data-broker - binding-data-broker - - - pcep:pcep-dispatcher - global-pcep-dispatcher - - - binding:binding-rpc-registry - binding-rpc-broker - - - pgmspi:instruction-scheduler - global-instruction-scheduler - - pcep-topology - -//SERVICES START - - pcepspi:extensions - - global-pcep-extensions - /config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions'] - - - - pcepspi:extension - - pcep-parser-base - /config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base'] - - - pcep-parser-crabbe-initiated - /config/modules/module[name='pcep-parser-crabbe-initiated']/instance[name='pcep-parser-crabbe-initiated'] - - - - pcep:pcep-session-proposal-factory - - global-pcep-session-proposal-factory - /config/modules/module[name='pcep-session-proposal-factory-impl']/instance[name='global-pcep-session-proposal-factory'] - - - - pcep:pcep-dispatcher - - global-pcep-dispatcher - /config/modules/module[name='pcep-dispatcher-impl']/instance[name='global-pcep-dispatcher'] - - - - pcep:pcep-topology-reference - - pcep-topology - /config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology'] - - -//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 deleted file mode 100644 index 7f3fb0ac..00000000 --- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf +++ /dev/null @@ -1,155 +0,0 @@ -//MODULES START - - prefix:bgp-proposal-impl - example-bgp-proposal - 64496 - 192.0.2.2 - - - prefix:bgp-impl - example-bgp-peer - - prefix:bgp-dispatcher - global-bgp-dispatcher - - - prefix:bgp-proposal - example-bgp-proposal - - route-reflector.example.org - - - prefix:timed-reconnect-strategy - example-reconnect-strategy - 1000 - 180000 - 2.00 - 5000 - - netty:netty-event-executor - global-event-executor - - - - prefix:rib-impl - example-bgp-rib - - prefix:listener - example-bgp-peer - - - ribspi:extensions - global-rib-extensions - - - binding:binding-data-broker - binding-data-broker - - - prefix:reconnect-strategy - example-reconnect-strategy - - - prefix:reconnect-strategy - example-reconnect-strategy - - - - prefix:bgp-reachability-ipv4 - example-ipv4-topology - - binding:binding-data-broker - binding-data-broker - - - prefix:rib - example-bgp-rib - - example-ipv4-topology - - - prefix:bgp-reachability-ipv4 - example-ipv6-topology - - binding:binding-data-broker - binding-data-broker - - - prefix:rib - example-bgp-rib - - example-ipv6-topology - - - prefix:bgp-linkstate-topology - example-linkstate-topology - - binding:binding-data-broker - binding-data-broker - - - prefix:rib - example-bgp-rib - - example-linkstate-topology - -//SERVICES START - - prefix:bgp-proposal - - example-bgp-proposal - /config/modules/module[name='bgp-proposal-impl']/instance[name='example-bgp-proposal'] - - - - prefix:listener - - example-bgp-peer - /config/modules/module[name='bgp-impl']/instance[name='example-bgp-peer'] - - - - prefix:reconnect-strategy - - example-reconnect-strategy - /config/modules/module[name='timed-reconnect-strategy']/instance[name='example-reconnect-strategy'] - - - - prefix:topology-reference - - example-ipv4-topology - /config/modules/module[name='bgp-reachability-ipv4']/instance[name='example-ipv4-topology'] - - - - prefix:rib - - example-bgp-rib - /config/modules/module[name='rib-impl']/instance[name='example-bgp-rib'] - - - - prefix:topology-reference - - example-ipv6-topology - /config/modules/module[name='bgp-reachability-ipv6']/instance[name='example-ipv6-topology'] - - - - prefix:topology-reference - - example-linkstate-topology - /config/modules/module[name='bgp-linkstate-topology']/instance[name='example-linkstate-topology'] - - -//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