From d1c6a3735d6fa3e10858d467311a8335324754f2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 Dec 2013 09:47:22 +0100 Subject: [PATCH] Split the configuration into multiple files for clarity Change-Id: I57b8bc744270cecca145023370c0df481ecde6fb Signed-off-by: Robert Varga --- .../configuration/initial/30-bgpcep.conf | 180 ------------------ .../configuration/initial/30-programming.conf | 30 +++ .../configuration/initial/31-bgp.conf | 81 ++++++++ .../configuration/initial/32-pcep.conf | 108 +++++++++++ .../configuration/initial/41-bgp-example.conf | 155 +++++++++++++++ 5 files changed, 374 insertions(+), 180 deletions(-) delete mode 100644 distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-bgpcep.conf create mode 100644 distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf create mode 100644 distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf create mode 100644 distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf create mode 100644 distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf 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 index 981d96cd..00000000 --- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-bgpcep.conf +++ /dev/null @@ -1,180 +0,0 @@ -//MODULES START - - prefix:instruction-scheduler-impl - global-instruction-scheduler - - binding:binding-notification-service - ref_binding-notification-broker - - - binding:binding-rpc-registry - ref_binding-rpc-broker - - - netty:netty-timer - global-timer - - - - prefix:bgp-extensions-impl - global-bgp-extensions - - - prefix:base-bgp-parser - base-bgp-parser - - bgpspi:extensions - global-bgp-extensions - - - - prefix:bgp-rib-extensions-impl - global-rib-extensions - - - prefix:bgp-linkstate - bgp-linkstate - - bgpspi:extensions - global-bgp-extensions - - - ribspi:extensions - global-rib-extensions - - - - prefix:bgp-dispatcher-impl - global-bgp-dispatcher - - bgpspi:extensions - global-bgp-extensions - - - netty:netty-threadgroup - global-boss-group - - - netty:netty-threadgroup - global-worker-group - - - - prefix:pcep-extensions-impl - global-pcep-extensions - - - 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-impl - pcep-topology - - binding:binding-data-broker - ref_binding-data-broker - - - pcep:pcep-dispatcher - pcep-dispatcher - - - binding:binding-rpc-registry - ref_binding-rpc-broker - - - pgmspi:instruction-scheduler - global-instruction-scheduler - - pcep-topology - -//SERVICES START - - pgmspi:instruction-scheduler - - global-instruction-scheduler - /config/modules/module[name='instruction-scheduler-impl']/instance[name='global-instruction-scheduler'] - - - - bgpspi:extensions - - global-bgp-extensions - /config/modules/module[name='bgp-extensions-impl']/instance[name='global-bgp-extensions'] - - - - ribspi:extensions - - global-rib-extensions - /config/modules/module[name='bgp-rib-extensions-impl']/instance[name='global-rib-extensions'] - - - - prefix:bgp-dispatcher - - global-bgp-dispatcher - /config/modules/module[name='bgp-dispatcher-impl']/instance[name='global-bgp-dispatcher'] - - - - pcepspi:extensions - - global-pcep-extensions - /config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions'] - - - - 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 - - pcep-topology - /config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology'] - - -//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 index 00000000..2f38e8e1 --- /dev/null +++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf @@ -0,0 +1,30 @@ +//MODULES START + + prefix:instruction-scheduler-impl + global-instruction-scheduler + + binding:binding-notification-service + ref_binding-notification-broker + + + binding:binding-rpc-registry + ref_binding-rpc-broker + + + netty:netty-timer + global-timer + + +//SERVICES START + + pgmspi:instruction-scheduler + + global-instruction-scheduler + /config/modules/module[name='instruction-scheduler-impl']/instance[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 new file mode 100644 index 00000000..ddfda7f6 --- /dev/null +++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf @@ -0,0 +1,81 @@ +//MODULES START + + prefix:bgp-extensions-impl + global-bgp-extensions + + + prefix:base-bgp-parser + base-bgp-parser + + bgpspi:extensions + global-bgp-extensions + + + + prefix:bgp-rib-extensions-impl + global-rib-extensions + + + prefix:base-bgp-rib + base-bgp-rib + + ribspi:extensions + global-rib-extensions + + + + prefix:bgp-linkstate + bgp-linkstate + + bgpspi:extensions + global-bgp-extensions + + + ribspi:extensions + global-rib-extensions + + + + 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 + /config/modules/module[name='bgp-extensions-impl']/instance[name='global-bgp-extensions'] + + + + ribspi:extensions + + global-rib-extensions + /config/modules/module[name='bgp-rib-extensions-impl']/instance[name='global-rib-extensions'] + + + + prefix:bgp-dispatcher + + global-bgp-dispatcher + /config/modules/module[name='bgp-dispatcher-impl']/instance[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 new file mode 100644 index 00000000..d7d23f97 --- /dev/null +++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf @@ -0,0 +1,108 @@ +//MODULES START + + prefix:pcep-extensions-impl + global-pcep-extensions + + + prefix:pcep-parser-base + pcep-parser-base + + pcepspi:extensions + global-pcep-extensions + + + + prefix:pcep-parser-crabbe-initiated + pcep-parser-crabbe-initiated + + pcepspi:extensions + global-pcep-extensions + + + + 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-impl + pcep-topology + + binding:binding-data-broker + ref_binding-data-broker + + + pcep:pcep-dispatcher + global-pcep-dispatcher + + + binding:binding-rpc-registry + ref_binding-rpc-broker + + + pgmspi:instruction-scheduler + global-instruction-scheduler + + pcep-topology + 0.0.0.0 + 4189 + +//SERVICES START + + pcepspi:extensions + + global-pcep-extensions + /config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions'] + + + + 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 + + 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 new file mode 100644 index 00000000..66b5c282 --- /dev/null +++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf @@ -0,0 +1,155 @@ +//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 + ref_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 + ref_binding-data-broker + + + prefix:rib + example-bgp-rib + + example-ipv4-topology + + + prefix:bgp-reachability-ipv4 + example-ipv6-topology + + binding:binding-data-broker + ref_binding-data-broker + + + prefix:rib + example-bgp-rib + + example-ipv6-topology + + + prefix:bgp-linkstate-topology + example-linkstate-topology + + binding:binding-data-broker + ref_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 -- 2.36.6