From 929abd9871710440bb19be194cd53e6e4e94617a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 2 Dec 2013 17:21:18 +0100 Subject: [PATCH] Clean up initial configuration This removes the empty logging configuration, adds the global netty configuration block, which can be reused by other components and renames the files such that their names tell us what is it they are doing. Change-Id: I6b7a9a75dbb376acdf17d7499a7c392acee9f491 Signed-off-by: Robert Varga --- .../configuration/initial/00-netty.conf | 48 +++++++++++++++++++ ...controller-config.2.txt => 01-md-sal.conf} | 0 .../initial/controller-config.1.txt | 5 -- 3 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf rename opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/{controller-config.2.txt => 01-md-sal.conf} (100%) delete mode 100644 opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf new file mode 100644 index 0000000000..ffee9c6da8 --- /dev/null +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf @@ -0,0 +1,48 @@ +//MODULES START + + netty:netty-threadgroup-fixed + global-boss-group + + + netty:netty-threadgroup-fixed + global-worker-group + + + netty:netty-hashed-wheel-timer + global-timer + + + netty:netty-global-event-executor + global-event-executor + +//SERVICES START + + netty:netty-threadgroup + + global-boss-group + /config/modules/module[name='netty-threadgroup-fixed']/instance[name='global-boss-group'] + + + global-worker-group + /config/modules/module[name='netty-threadgroup-fixed']/instance[name='global-worker-group'] + + + + netty:netty-event-executor + + global-event-executor + /config/modules/module[name='netty-global-eventexecutor']/instance[name='global-event-executor'] + + + + netty:netty-timer + + global-timer + /config/modules/module[name='netty-hashed-wheel-timer']/instance[name='global-timer'] + + +//CAPABILITIES START +urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19 +urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&revision=2013-11-12 +urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup?module=threadgroup&revision=2013-11-07 +urn:opendaylight:params:xml:ns:yang:controller:netty:timer?module=netty-timer&revision=2013-11-19 diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.2.txt b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf similarity index 100% rename from opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.2.txt rename to opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt deleted file mode 100644 index 689b45ad3b..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/controller-config.1.txt +++ /dev/null @@ -1,5 +0,0 @@ -//MODULES START -//SERVICES START - -//CAPABILITIES START -urn:opendaylight:params:xml:ns:yang:controller:logback:config?module=config-logging&revision=2013-07-16 -- 2.36.6