From: Ed Warnicke Date: Wed, 22 Jan 2014 05:21:23 +0000 (+0000) Subject: Merge "sal-remoterpc-connector: sync ch.qos.logback:logback-classic version" X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~28 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b29204146ca6957b5f968e07d9e7e2052ba70ef1;hp=de720d9b3ce0db8d90b992f67bfcb01465cb36c7 Merge "sal-remoterpc-connector: sync ch.qos.logback:logback-classic version" --- diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml index f3a6a3bf4d..157a341094 100644 --- a/opendaylight/appauth/pom.xml +++ b/opendaylight/appauth/pom.xml @@ -47,23 +47,20 @@ - - org.opendaylight.controller - sal - 0.7.0-SNAPSHOT - - - org.opendaylight.controller - containermanager - 0.5.1-SNAPSHOT - - - org.opendaylight.controller - usermanager - 0.4.1-SNAPSHOT - - - junit + + org.opendaylight.controller + sal + + + org.opendaylight.controller + containermanager + + + org.opendaylight.controller + usermanager + + + junit junit diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml index 8d3df87c58..c04bccd00d 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -63,22 +63,18 @@ org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml index 1e317765c4..e0f03739bb 100644 --- a/opendaylight/clustering/integrationtest/pom.xml +++ b/opendaylight/clustering/integrationtest/pom.xml @@ -21,32 +21,26 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.services-implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT junit diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml index 536fb7dd2e..2d48934cfd 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/clustering/services_implementation/pom.xml @@ -137,12 +137,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.jboss.jbossts.jta diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml index 26980e4ff5..31577fc32e 100644 --- a/opendaylight/clustering/stub/pom.xml +++ b/opendaylight/clustering/stub/pom.xml @@ -48,12 +48,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml index e6f889c478..6d4fb57a38 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/clustering/test/pom.xml @@ -52,12 +52,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT equinoxSDK381 diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml index fe5aa473a6..42da74b8f4 100644 --- a/opendaylight/commons/integrationtest/pom.xml +++ b/opendaylight/commons/integrationtest/pom.xml @@ -22,37 +22,30 @@ equinoxSDK381 org.eclipse.equinox.console - 1.0.0.v20120522-1841 equinoxSDK381 org.eclipse.equinox.util - 1.0.400.v20120522-2049 equinoxSDK381 org.eclipse.osgi.services - 3.3.100.v20120522-1822 equinoxSDK381 org.eclipse.equinox.ds - 1.4.0.v20120522-1841 equinoxSDK381 org.apache.felix.gogo.command - 0.8.0.v201108120515 equinoxSDK381 org.apache.felix.gogo.runtime - 0.8.0.v201108120515 equinoxSDK381 org.apache.felix.gogo.shell - 0.8.0.v201110170705 junit diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 98a0bd196b..3eba5f0b3c 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -76,7 +76,9 @@ 0.6.0-SNAPSHOT 0.4.1-SNAPSHOT - 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT @@ -84,6 +86,7 @@ 0.2.3-SNAPSHOT 1.0-SNAPSHOT 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT 0.7.0-SNAPSHOT 0.1.1-SNAPSHOT 0.7.0-SNAPSHOT @@ -93,7 +96,6 @@ 0.1.1-SNAPSHOT 0.5.1-SNAPSHOT 0.4.0-SNAPSHOT - 0.0.1-SNAPSHOT 4.0.10.Final 2.4 0.4.1-SNAPSHOT @@ -103,9 +105,11 @@ 0.5.0-SNAPSHOT 0.4.1-SNAPSHOT 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT - 1.18-SNAPSHOT - 7.0.43-SNAPSHOT + 1.17 + 7.0.42 0.4.1-SNAPSHOT @@ -360,8 +364,7 @@ com.google.code.gson gson - 2.1 - compile + 2.2.4 org.jboss.spec.javax.transaction @@ -699,6 +702,11 @@ protocol-framework ${protocol-framework.version} + + org.opendaylight.yangtools + concepts + ${yangtools.version} + @@ -758,15 +766,362 @@ yang-model-api ${yangtools.version} + + org.opendaylight.controller + hosttracker + ${hosttracker.api.version} + + + org.opendaylight.controller + hosttracker.implementation + ${hosttracker.implementation.version} + + + org.opendaylight.controller + hosttracker_new + ${hosttracker_new.api.version} + + + org.opendaylight.controller + forwarding.staticrouting + ${forwarding.staticrouting} + + + org.opendaylight.controller + clustering.services + ${clustering.services.version} + + + org.opendaylight.controller + clustering.services-implementation + ${controller.version} + + + org.opendaylight.controller + clustering.stub + ${clustering.stub.version} + + + org.opendaylight.controller + configuration + ${controller.version} + + + org.opendaylight.controller + configuration.implementation + ${controller.version} + + + org.opendaylight.controller + routing.dijkstra_implementation + ${controller.version} + + + org.opendaylight.controller + arphandler + ${arphandler.version} + + + org.opendaylight.controller + containermanager + ${containermanager.version} + + + org.opendaylight.controller + containermanager.implementation + ${containermanager.version} + + + org.opendaylight.controller + containermanager.it.implementation + ${containermanager.it.version} + + + org.opendaylight.controller + appauth + ${controller.version} + org.opendaylight.controller switchmanager ${switchmanager.api.version} - org.opendaylight.yangtools - concepts - ${yangtools.version} + org.opendaylight.controller + switchmanager.implementation + ${controller.version} + + + org.opendaylight.controller + statisticsmanager + ${statisticsmanager.version} + + + org.opendaylight.controller + statisticsmanager.implementation + ${controller.version} + + + org.opendaylight.controller + topologymanager + ${topologymanager.version} + + + org.opendaylight.controller + usermanager + ${usermanager.version} + + + org.opendaylight.controller + usermanager.implementation + ${usermanager.version} + + + org.opendaylight.controller + connectionmanager + ${connectionmanager.version} + + + org.opendaylight.controller + connectionmanager.implementation + ${connectionmanager.version} + + + org.opendaylight.controller + security + ${controller.version} + + + org.opendaylight.controller + forwardingrulesmanager + ${forwardingrulesmanager.version} + + + org.opendaylight.controller + forwardingrulesmanager.implementation + ${controller.version} + + + + + org.opendaylight.controller + sal + ${sal.version} + + + org.opendaylight.controller + sal.implementation + ${controller.version} + + + + + org.opendaylight.controller + sal.connection + ${sal.connection.version} + + + org.opendaylight.controller + sal.connection.implementation + ${sal.connection.version} + + + org.opendaylight.controller + sal.networkconfiguration + ${sal.networkconfiguration.version} + + + org.opendaylight.controller + sal.networkconfiguration.implementation + ${sal.networkconfiguration.version} + + + + + org.opendaylight.controller + web + ${controller.version} + + + org.opendaylight.controller + flows.web + ${controller.version} + + + org.opendaylight.controller + devices.web + ${controller.version} + + + org.opendaylight.controller + troubleshoot.web + ${controller.version} + + + org.opendaylight.controller + topology.web + ${controller.version} + + + org.opendaylight.controller + osgi-brandfragment.web + 0.0.1-SNAPSHOT + + + + + org.opendaylight.controller + networkconfig.neutron + ${controller.version} + + + org.opendaylight.controller + networkconfig.neutron.implementation + ${controller.version} + + + org.opendaylight.controller + networkconfig.neutron.northbound + ${controller.version} + + + + + org.opendaylight.controller + commons.northbound + ${controller.version} + + + org.opendaylight.controller + bundlescanner + ${bundlescanner.version} + + + org.opendaylight.controller + bundlescanner.implementation + ${bundlescanner.version} + + + org.opendaylight.controller + topology.northbound + ${controller.version} + + + org.opendaylight.controller + forwarding.staticrouting.northbound + ${controller.version} + + + org.opendaylight.controller + statistics.northbound + ${controller.version} + + + org.opendaylight.controller + flowprogrammer.northbound + ${controller.version} + + + org.opendaylight.controller + hosttracker.northbound + ${controller.version} + + + org.opendaylight.controller + subnets.northbound + ${controller.version} + + + org.opendaylight.controller + switchmanager.northbound + ${controller.version} + + + org.opendaylight.controller + containermanager.northbound + ${controller.version} + + + org.opendaylight.controller + networkconfig.bridgedomain.northbound + ${networkconfig.bridgedomain.northbound.version} + + + org.opendaylight.controller + httpservice-bridge + 0.0.1-SNAPSHOT + + + org.opendaylight.controller + jolokia-bridge + 0.0.1-SNAPSHOT + + + org.opendaylight.controller + connectionmanager.northbound + ${connectionmanager.version} + + + org.opendaylight.controller + usermanager.northbound + 0.0.1-SNAPSHOT + + + org.opendaylight.controller + controllermanager.northbound + 0.0.1-SNAPSHOT + + + + org.opendaylight.controller + logging.bridge + ${controller.version} + + + + + org.opendaylight.controller + protocol_plugins.openflow + ${controller.version} + + + org.opendaylight.controller + protocol_plugins.stub + ${protocol_plugin.stub.version} + + + + + org.opendaylight.controller + samples.loadbalancer + ${samples.loadbalancer} + + + org.opendaylight.controller + samples.loadbalancer.northbound + ${controller.version} + + + org.opendaylight.controller + samples.simpleforwarding + ${controller.version} + + + + + org.opendaylight.controller + clustering.test + ${controller.version} + + + org.opendaylight.controller + commons.httpclient + ${commons.httpclient.version} + + + org.opendaylight.controller + sanitytest + ${controller.version} @@ -794,6 +1149,11 @@ 0.0.1-SNAPSHOT test + + org.codehaus.enunciate + enunciate-core-annotations + ${enunciate.version} + diff --git a/opendaylight/config/logback-config/src/main/yang/config-logging.yang b/opendaylight/config/logback-config/src/main/yang/config-logging.yang index 3b28b57469..477876c669 100644 --- a/opendaylight/config/logback-config/src/main/yang/config-logging.yang +++ b/opendaylight/config/logback-config/src/main/yang/config-logging.yang @@ -32,7 +32,7 @@ module config-logging { when "/config:modules/config:module/config:type = 'logback'"; list file-appenders { - leaf append { + leaf append { type boolean; mandatory false; } @@ -41,12 +41,12 @@ module config-logging { type string; mandatory true; } - + leaf encoder-pattern { type string; mandatory true; } - + leaf name { type string; mandatory true; @@ -54,7 +54,7 @@ module config-logging { key name; config:java-name-prefix FileAppenderTO; } - + list rolling-appenders { leaf append { type boolean; @@ -96,17 +96,17 @@ module config-logging { type string; mandatory true; } - + leaf rolling-policy-type { type string; mandatory true; } - + leaf max-history { type int32; mandatory true; } - + leaf clean-history-on-start { type boolean; default false; diff --git a/opendaylight/config/netty-config-api/src/main/yang/netty.yang b/opendaylight/config/netty-config-api/src/main/yang/netty.yang index 7f7a3ff4ce..7cac5ad5bc 100644 --- a/opendaylight/config/netty-config-api/src/main/yang/netty.yang +++ b/opendaylight/config/netty-config-api/src/main/yang/netty.yang @@ -1,14 +1,14 @@ // vi: set smarttab et sw=4 tabstop=4: module netty { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty"; - prefix "netty"; + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:netty"; + prefix "netty"; - import config { prefix config; revision-date 2013-04-05; } + import config { prefix config; revision-date 2013-04-05; } - organization "Cisco Systems, Inc."; + organization "Cisco Systems, Inc."; - contact "Milos Fabian "; + contact "Milos Fabian "; description "This module contains the base YANG definitions for @@ -17,15 +17,15 @@ module netty { Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which - accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html"; + under the terms of the Eclipse Public License v1.0 which + accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html"; revision "2013-11-19" { description "Initial revision."; } - + identity netty-threadgroup { description "Configuration wrapper around netty's threadgroup"; @@ -33,7 +33,7 @@ module netty { base "config:service-type"; config:java-class "io.netty.channel.EventLoopGroup"; } - + identity netty-event-executor { description "Configuration wrapper around netty's event executor"; @@ -41,12 +41,12 @@ module netty { base "config:service-type"; config:java-class "io.netty.util.concurrent.EventExecutor"; } - + identity netty-timer { description "Configuration wrapper around netty's timer"; base "config:service-type"; - config:java-class "io.netty.util.Timer"; + config:java-class "io.netty.util.Timer"; } } \ No newline at end of file diff --git a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang b/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang index 16e5c07356..e9d1da3f2d 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang +++ b/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang @@ -1,7 +1,7 @@ // vi: set smarttab et sw=4 tabstop=4: module netty-event-executor { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor"; + namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor"; prefix "netty-ee"; import config { prefix config; revision-date 2013-04-05; } @@ -16,17 +16,17 @@ module netty-event-executor { netty event executor implementation. Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; - + This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which - accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html"; + under the terms of the Eclipse Public License v1.0 which + accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html"; revision "2013-11-12" { description "Initial revision"; } - + identity netty-global-event-executor { base config:module-type; config:provided-service netty:netty-event-executor; diff --git a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang index e648c5328a..71cbff4bcd 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang +++ b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang @@ -1,7 +1,7 @@ // vi: set smarttab et sw=4 tabstop=4: module threadgroup { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup"; + namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:threadgroup"; prefix "netty-th"; import config { prefix config; revision-date 2013-04-05; } @@ -49,5 +49,4 @@ module threadgroup { } } - } diff --git a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang index b53b13f5a8..e622be39c7 100644 --- a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang +++ b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang @@ -1,7 +1,7 @@ // vi: set smarttab et sw=4 tabstop=4: module netty-timer { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:timer"; + namespace "urn:opendaylight:params:xml:ns:yang:controller:netty:timer"; prefix "netty-timer"; import config { prefix config; revision-date 2013-04-05; } @@ -17,17 +17,17 @@ module netty-timer { netty timer implementation. Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; - + This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which - accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html"; + under the terms of the Eclipse Public License v1.0 which + accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html"; revision "2013-11-19" { description "Initial revision"; } - + identity netty-hashed-wheel-timer { base config:module-type; config:provided-service netty:netty-timer; @@ -37,23 +37,23 @@ module netty-timer { augment "/config:modules/config:module/config:configuration" { case netty-hashed-wheel-timer { when "/config:modules/config:module/config:type = 'netty-hashed-wheel-timer'"; - + leaf tick-duration { type uint32; } - + leaf ticks-per-wheel { type uint16; } - - container thread-factory { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity th:threadfactory; - } - } - } + + container thread-factory { + uses config:service-ref { + refine type { + mandatory false; + config:required-identity th:threadfactory; + } + } + } } } } \ No newline at end of file diff --git a/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang b/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang index 8f3064822b..4c34513591 100644 --- a/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang +++ b/opendaylight/config/threadpool-config-api/src/main/yang/threadpool.yang @@ -1,14 +1,14 @@ // vi: set smarttab et sw=4 tabstop=4: module threadpool { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:threadpool"; - prefix "th"; + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:threadpool"; + prefix "th"; - import config { prefix config; revision-date 2013-04-05; } + import config { prefix config; revision-date 2013-04-05; } - organization "Cisco Systems, Inc."; + organization "Cisco Systems, Inc."; - contact "Robert Varga "; + contact "Robert Varga "; description "This module contains the base YANG definitions for @@ -17,9 +17,9 @@ module threadpool { Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; This program and the accompanying materials are made available - under the terms of the Eclipse Public License v1.0 which - accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html"; + under the terms of the Eclipse Public License v1.0 which + accompanies this distribution, and is available at + http://www.eclipse.org/legal/epl-v10.html"; revision "2013-04-09" { description @@ -57,20 +57,20 @@ module threadpool { config:java-class "java.util.concurrent.ThreadFactory"; } - identity threadpool { + identity threadpool { description "A simple pool of threads able to execute work."; - base "config:service-type"; + base "config:service-type"; config:java-class "org.opendaylight.controller.config.threadpool.ThreadPool"; - } + } - identity scheduled-threadpool { + identity scheduled-threadpool { description "An extension of the simple pool of threads able to schedule work to be executed at some point in time."; - base "threadpool"; + base "threadpool"; config:java-class "org.opendaylight.controller.config.threadpool.ScheduledThreadPool"; - } + } } diff --git a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-flexible.yang b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-flexible.yang index 8d1a6307b5..be275ef487 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-flexible.yang +++ b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-flexible.yang @@ -13,7 +13,7 @@ module threadpool-impl-flexible { description "This module contains the base YANG definitions for - thread services pure Java implementation. + thread services pure Java implementation. Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; diff --git a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-scheduled.yang b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-scheduled.yang index 07f6c5b198..5bf277b328 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-scheduled.yang +++ b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-scheduled.yang @@ -13,7 +13,7 @@ module threadpool-impl-scheduled { description "This module contains the base YANG definitions for - thread services pure Java implementation. + thread services pure Java implementation. Copyright (c)2013 Cisco Systems, Inc. All rights reserved.; diff --git a/opendaylight/config/yang-store-api/src/main/java/org/opendaylight/controller/config/yang/store/api/YangStoreSnapshot.java b/opendaylight/config/yang-store-api/src/main/java/org/opendaylight/controller/config/yang/store/api/YangStoreSnapshot.java index da8b5e4ed1..b912b0c7af 100644 --- a/opendaylight/config/yang-store-api/src/main/java/org/opendaylight/controller/config/yang/store/api/YangStoreSnapshot.java +++ b/opendaylight/config/yang-store-api/src/main/java/org/opendaylight/controller/config/yang/store/api/YangStoreSnapshot.java @@ -7,21 +7,50 @@ */ package org.opendaylight.controller.config.yang.store.api; -import java.util.Map; -import java.util.Map.Entry; - import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Module; +import java.util.Map; +import java.util.Set; + public interface YangStoreSnapshot extends AutoCloseable { + /** + * @deprecated Use {@link #getQNamesToIdentitiesToModuleMXBeanEntries()} instead. This method return only one + * module representation even if multiple revisions are available. + */ + @Deprecated Map> getModuleMXBeanEntryMap(); - Map> getModuleMap(); + Map> getQNamesToIdentitiesToModuleMXBeanEntries(); + + /** + * Get number of parsed ModuleMXBeanEntry instances. + */ int countModuleMXBeanEntries(); + /** + * Get all modules discovered when this snapshot was created. + * @return all modules discovered. If one module exists with two different revisions, return both. + */ + Set getModules(); + + /** + * Get all modules together with their yang sources. + */ + Map getModulesToSources(); + + /** + * Retrieve source of module as it appeared during creation of this snapshot. + * @param module + * @return yang source of given module + * @throws java.lang.IllegalArgumentException if module does not belong to this snapshot + */ + String getModuleSource(Module module); + @Override void close(); } diff --git a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java index 0d704a8f6a..b5efc51d8b 100644 --- a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java +++ b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTracker.java @@ -14,12 +14,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import org.opendaylight.controller.config.yang.store.api.YangStoreException; import org.opendaylight.controller.config.yang.store.api.YangStoreService; import org.opendaylight.controller.config.yang.store.api.YangStoreSnapshot; -import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; -import org.opendaylight.yangtools.yang.model.api.Module; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; @@ -36,8 +33,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -220,78 +215,3 @@ public class ExtenderYangTracker extends BundleTracker implements YangSt cache.invalidate(); } } - -class YangStoreCache { - private static final Logger logger = LoggerFactory.getLogger(YangStoreCache.class); - - @GuardedBy("this") - private Set cachedUrls = null; - @GuardedBy("this") - private Optional cachedYangStoreSnapshot = getInitialSnapshot(); - @GuardedBy("this") - private Collection inconsistentURLsForReporting = Collections.emptySet(); - - synchronized Optional getSnapshotIfPossible(Multimap bundlesToYangURLs) { - Set urls = setFromMultimapValues(bundlesToYangURLs); - - if (cachedUrls==null || cachedUrls.equals(urls)) { - Preconditions.checkState(cachedYangStoreSnapshot.isPresent()); - YangStoreSnapshot freshSnapshot = new YangStoreSnapshotImpl(cachedYangStoreSnapshot.get()); - if (inconsistentURLsForReporting.size() > 0){ - logger.warn("Some yang URLs are ignored: {}", inconsistentURLsForReporting); - } - return Optional.of(freshSnapshot); - } - - return Optional.absent(); - } - - private static Set setFromMultimapValues( - Multimap bundlesToYangURLs) { - Set urls = Sets.newHashSet(bundlesToYangURLs.values()); - Preconditions.checkState(bundlesToYangURLs.size() == urls.size()); - return urls; - } - - synchronized void cacheYangStore(Multimap urls, - YangStoreSnapshot yangStoreSnapshot) { - this.cachedUrls = setFromMultimapValues(urls); - this.cachedYangStoreSnapshot = Optional.of(yangStoreSnapshot); - } - - synchronized void invalidate() { - cachedUrls.clear(); - if (cachedYangStoreSnapshot.isPresent()){ - cachedYangStoreSnapshot.get().close(); - cachedYangStoreSnapshot = Optional.absent(); - } - } - - public synchronized void setInconsistentURLsForReporting(Collection urls){ - inconsistentURLsForReporting = urls; - } - - private Optional getInitialSnapshot() { - YangStoreSnapshot initialSnapshot = new YangStoreSnapshot() { - @Override - public Map> getModuleMXBeanEntryMap() { - return Collections.emptyMap(); - } - - @Override - public Map> getModuleMap() { - return Collections.emptyMap(); - } - - @Override - public int countModuleMXBeanEntries() { - return 0; - } - - @Override - public void close() { - } - }; - return Optional.of(initialSnapshot); - } -} diff --git a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/MbeParser.java b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/MbeParser.java index d54996dbb7..dd07c5a84f 100644 --- a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/MbeParser.java +++ b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/MbeParser.java @@ -21,25 +21,27 @@ import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; public class MbeParser { + private static final Logger logger = LoggerFactory.getLogger(MbeParser.class); - public YangStoreSnapshotImpl parseYangFiles( - Collection allInput) - throws YangStoreException { + public YangStoreSnapshotImpl parseYangFiles(Collection allInput) throws YangStoreException { YangParserImpl parser = YangParserWrapper.getYangParserInstance(); Map allYangModules = YangParserWrapper.parseYangFiles(parser, allInput); SchemaContext resolveSchemaContext = YangParserWrapper.getSchemaContextFromModules(parser, allYangModules); - + logger.trace("Resolved modules:{}", resolveSchemaContext.getModules()); // JMX generator Map namespaceToPackageMapping = Maps.newHashMap(); @@ -69,35 +71,47 @@ public class MbeParser { } } - Map> retVal = Maps.newHashMap(); - Map> modulesMap = new HashMap<>(); + Map> moduleMXBeanEntryMap = Maps.newHashMap(); + Map modulesToSources = new HashMap<>(); + Map> + qNamesToIdentitiesToModuleMXBeanEntries = new HashMap<>(); + for (Entry moduleEntry : allYangModules.entrySet()) { - String packageName = packageTranslator.getPackageName(moduleEntry - .getValue()); + Module module = moduleEntry.getValue(); + String packageName = packageTranslator.getPackageName(module); TypeProviderWrapper typeProviderWrapper = new TypeProviderWrapper( new TypeProviderImpl(resolveSchemaContext)); - String yangAsString; - try { - moduleEntry.getKey().reset(); - yangAsString = IOUtils.toString(moduleEntry.getKey()); - } catch (IOException e) { - throw new IllegalStateException(e); - } - modulesMap.put(moduleEntry.getValue().getName(), - Maps.immutableEntry(moduleEntry.getValue(), yangAsString)); - Map namesToMBEs = ModuleMXBeanEntry - .create(moduleEntry.getValue(), qNamesToSIEs, resolveSchemaContext, typeProviderWrapper, - packageName); - retVal.put(moduleEntry.getValue().getNamespace().toString(), - namesToMBEs); + String yangAsString = reReadInputStream(moduleEntry); + + QName qName = new QName(module.getNamespace(), module.getRevision(), module.getName()); + + Map namesToMBEs = + Collections.unmodifiableMap(ModuleMXBeanEntry.create(module, qNamesToSIEs, resolveSchemaContext, + typeProviderWrapper, packageName)); + moduleMXBeanEntryMap.put(module.getNamespace().toString(), namesToMBEs); + modulesToSources.put(module, yangAsString); + qNamesToIdentitiesToModuleMXBeanEntries.put(qName, namesToMBEs); } - return new YangStoreSnapshotImpl(retVal, modulesMap); + return new YangStoreSnapshotImpl(moduleMXBeanEntryMap, modulesToSources, qNamesToIdentitiesToModuleMXBeanEntries); + } + + private String reReadInputStream(Entry moduleEntry) { + String yangAsString; + try { + moduleEntry.getKey().reset(); + yangAsString = IOUtils.toString(moduleEntry.getKey()); + } catch (IOException e) { + throw new IllegalStateException("Cannot reread " + moduleEntry.getValue(), e); + } + return yangAsString; } - public Map parseYangFilesToString( - Collection allYangs) { + @Deprecated + public Map parseYangFilesToString(Collection allYangs) { + + logger.error("Using deprecated method that will be removed soon", new UnsupportedOperationException("Deprecated")); YangParserImpl parser = YangParserWrapper.getYangParserInstance(); Map allYangModules = parser diff --git a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreCache.java b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreCache.java new file mode 100644 index 0000000000..321ce3af72 --- /dev/null +++ b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreCache.java @@ -0,0 +1,110 @@ +package org.opendaylight.controller.config.yang.store.impl; + +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; +import org.opendaylight.controller.config.yang.store.api.YangStoreSnapshot; +import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.osgi.framework.Bundle; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.concurrent.GuardedBy; +import java.net.URL; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +class YangStoreCache { + private static final Logger logger = LoggerFactory.getLogger(YangStoreCache.class); + + @GuardedBy("this") + private Set cachedUrls = null; + @GuardedBy("this") + private Optional cachedYangStoreSnapshot = getInitialSnapshot(); + @GuardedBy("this") + private Collection inconsistentURLsForReporting = Collections.emptySet(); + + synchronized Optional getSnapshotIfPossible(Multimap bundlesToYangURLs) { + Set urls = setFromMultimapValues(bundlesToYangURLs); + + if (cachedUrls==null || cachedUrls.equals(urls)) { + Preconditions.checkState(cachedYangStoreSnapshot.isPresent()); + YangStoreSnapshot freshSnapshot = YangStoreSnapshotImpl.copy(cachedYangStoreSnapshot.get()); + if (inconsistentURLsForReporting.size() > 0){ + logger.warn("Some yang URLs are ignored: {}", inconsistentURLsForReporting); + } + return Optional.of(freshSnapshot); + } + + return Optional.absent(); + } + + private static Set setFromMultimapValues( + Multimap bundlesToYangURLs) { + Set urls = Sets.newHashSet(bundlesToYangURLs.values()); + Preconditions.checkState(bundlesToYangURLs.size() == urls.size()); + return urls; + } + + synchronized void cacheYangStore(Multimap urls, + YangStoreSnapshot yangStoreSnapshot) { + this.cachedUrls = setFromMultimapValues(urls); + this.cachedYangStoreSnapshot = Optional.of(yangStoreSnapshot); + } + + synchronized void invalidate() { + cachedUrls.clear(); + if (cachedYangStoreSnapshot.isPresent()){ + cachedYangStoreSnapshot.get().close(); + cachedYangStoreSnapshot = Optional.absent(); + } + } + + public synchronized void setInconsistentURLsForReporting(Collection urls){ + inconsistentURLsForReporting = urls; + } + + private Optional getInitialSnapshot() { + YangStoreSnapshot initialSnapshot = new YangStoreSnapshot() { + @Override + public Map> getModuleMXBeanEntryMap() { + return Collections.emptyMap(); + } + + @Override + public Map> getQNamesToIdentitiesToModuleMXBeanEntries() { + return Collections.emptyMap(); + } + + @Override + public Set getModules() { + return Collections.emptySet(); + } + + @Override + public Map getModulesToSources() { + return Collections.emptyMap(); + } + + @Override + public String getModuleSource(Module module) { + throw new IllegalArgumentException("Cannot get sources in empty snapshot"); + } + + @Override + public int countModuleMXBeanEntries() { + return 0; + } + + @Override + public void close() { + } + }; + return Optional.of(initialSnapshot); + } +} diff --git a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreSnapshotImpl.java b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreSnapshotImpl.java index ea709e1a45..474d754798 100644 --- a/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreSnapshotImpl.java +++ b/opendaylight/config/yang-store-impl/src/main/java/org/opendaylight/controller/config/yang/store/impl/YangStoreSnapshotImpl.java @@ -9,29 +9,39 @@ package org.opendaylight.controller.config.yang.store.impl; import org.opendaylight.controller.config.yang.store.api.YangStoreSnapshot; import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Module; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.Map; -import java.util.Map.Entry; +import java.util.Set; public class YangStoreSnapshotImpl implements YangStoreSnapshot { + private static final Logger logger = LoggerFactory.getLogger(YangStoreSnapshotImpl.class); + @Deprecated private final Map> moduleMXBeanEntryMap; - private final Map> moduleMap; + private final Map modulesToSources; + private final Map> qNamesToIdentitiesToModuleMXBeanEntries; + + public YangStoreSnapshotImpl(Map> moduleMXBeanEntryMap, + Map modulesToSources, + Map> qNamesToIdentitiesToModuleMXBeanEntries) { - public YangStoreSnapshotImpl( - Map> moduleMXBeanEntryMap, - Map> moduleMap) { this.moduleMXBeanEntryMap = Collections.unmodifiableMap(moduleMXBeanEntryMap); - this.moduleMap = Collections.unmodifiableMap(moduleMap); + this.modulesToSources = Collections.unmodifiableMap(modulesToSources); + this.qNamesToIdentitiesToModuleMXBeanEntries = Collections.unmodifiableMap(qNamesToIdentitiesToModuleMXBeanEntries); } - public YangStoreSnapshotImpl(YangStoreSnapshot yangStoreSnapshot) { - this.moduleMXBeanEntryMap = yangStoreSnapshot.getModuleMXBeanEntryMap(); - this.moduleMap = yangStoreSnapshot.getModuleMap(); + public static YangStoreSnapshotImpl copy(YangStoreSnapshot yangStoreSnapshot) { + return new YangStoreSnapshotImpl( + yangStoreSnapshot.getModuleMXBeanEntryMap(), + yangStoreSnapshot.getModulesToSources(), + yangStoreSnapshot.getQNamesToIdentitiesToModuleMXBeanEntries()); } /** @@ -44,8 +54,28 @@ public class YangStoreSnapshotImpl implements YangStoreSnapshot { } @Override - public Map> getModuleMap() { - return moduleMap; + public Map> getQNamesToIdentitiesToModuleMXBeanEntries() { + return qNamesToIdentitiesToModuleMXBeanEntries; + } + + @Override + public Set getModules() { + return modulesToSources.keySet(); + } + + @Override + public String getModuleSource(Module module) { + String result = modulesToSources.get(module); + if (result == null) { + logger.trace("Cannot find module {} in {}", module, modulesToSources); + throw new IllegalArgumentException("Module not found in this snapshot:" + module); + } + return result; + } + + @Override + public Map getModulesToSources() { + return modulesToSources; } @Override diff --git a/opendaylight/config/yang-store-impl/src/test/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTrackerCustomizerTest.java b/opendaylight/config/yang-store-impl/src/test/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTrackerCustomizerTest.java index b4054c242c..8a7b95ff3e 100644 --- a/opendaylight/config/yang-store-impl/src/test/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTrackerCustomizerTest.java +++ b/opendaylight/config/yang-store-impl/src/test/java/org/opendaylight/controller/config/yang/store/impl/ExtenderYangTrackerCustomizerTest.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyCollectionOf; import static org.mockito.Mockito.doNothing; @@ -82,8 +81,9 @@ public class ExtenderYangTrackerCustomizerTest { doReturn(22).when(yangStoreSnapshot).countModuleMXBeanEntries(); doReturn("mock yang store").when(yangStoreSnapshot).toString(); doNothing().when(yangStoreSnapshot).close(); - doReturn(moduleMap).when(yangStoreSnapshot).getModuleMap(); doReturn(Collections.emptyMap()).when(yangStoreSnapshot).getModuleMXBeanEntryMap(); + doReturn(Collections.emptyMap()).when(yangStoreSnapshot).getModulesToSources(); + doReturn(Collections.emptyMap()).when(yangStoreSnapshot).getQNamesToIdentitiesToModuleMXBeanEntries(); } @Test @@ -99,7 +99,6 @@ public class ExtenderYangTrackerCustomizerTest { returnedStore = tested.getYangStoreSnapshot(); - assertEquals(yangStoreSnapshot.getModuleMap(), returnedStore.getModuleMap()); tested.removedBundle(bundle, null, null); tested.getYangStoreSnapshot(); diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml index 282185bd70..2e9104a4b0 100644 --- a/opendaylight/configuration/api/pom.xml +++ b/opendaylight/configuration/api/pom.xml @@ -44,7 +44,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml index db596bf346..9eb2e16809 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/configuration/implementation/pom.xml @@ -52,17 +52,14 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/configuration/integrationtest/pom.xml index 65d46c3e0a..aa3758142b 100644 --- a/opendaylight/configuration/integrationtest/pom.xml +++ b/opendaylight/configuration/integrationtest/pom.xml @@ -20,47 +20,38 @@ org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services-implementation - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller @@ -69,27 +60,22 @@ org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/connectionmanager/api/pom.xml b/opendaylight/connectionmanager/api/pom.xml index ab0a32882e..01799f996b 100644 --- a/opendaylight/connectionmanager/api/pom.xml +++ b/opendaylight/connectionmanager/api/pom.xml @@ -45,12 +45,10 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml index 1ca905054b..744198acf8 100644 --- a/opendaylight/containermanager/api/pom.xml +++ b/opendaylight/containermanager/api/pom.xml @@ -54,7 +54,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml index bd12bfc87d..9c160dcf3e 100644 --- a/opendaylight/containermanager/implementation/pom.xml +++ b/opendaylight/containermanager/implementation/pom.xml @@ -62,37 +62,30 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller appauth - 0.4.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java index 7319d5a15d..d9e941ef78 100644 --- a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java +++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/ContainerManager.java @@ -30,6 +30,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; +import org.opendaylight.controller.appauth.authorization.Authorization; import org.opendaylight.controller.clustering.services.CacheConfigException; import org.opendaylight.controller.clustering.services.CacheExistException; import org.opendaylight.controller.clustering.services.ICacheUpdateAware; @@ -37,8 +38,14 @@ import org.opendaylight.controller.clustering.services.IClusterGlobalServices; import org.opendaylight.controller.clustering.services.IClusterServices; import org.opendaylight.controller.configuration.IConfigurationAware; import org.opendaylight.controller.configuration.IConfigurationService; +import org.opendaylight.controller.containermanager.ContainerChangeEvent; +import org.opendaylight.controller.containermanager.ContainerConfig; +import org.opendaylight.controller.containermanager.ContainerData; +import org.opendaylight.controller.containermanager.ContainerFlowChangeEvent; +import org.opendaylight.controller.containermanager.ContainerFlowConfig; import org.opendaylight.controller.containermanager.IContainerAuthorization; import org.opendaylight.controller.containermanager.IContainerManager; +import org.opendaylight.controller.containermanager.NodeConnectorsChangeEvent; import org.opendaylight.controller.sal.authorization.AppRoleLevel; import org.opendaylight.controller.sal.authorization.Privilege; import org.opendaylight.controller.sal.authorization.Resource; @@ -65,14 +72,6 @@ import org.opendaylight.controller.topologymanager.ITopologyManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.opendaylight.controller.appauth.authorization.Authorization; -import org.opendaylight.controller.containermanager.ContainerFlowChangeEvent; -import org.opendaylight.controller.containermanager.ContainerFlowConfig; -import org.opendaylight.controller.containermanager.NodeConnectorsChangeEvent; -import org.opendaylight.controller.containermanager.ContainerChangeEvent; -import org.opendaylight.controller.containermanager.ContainerConfig; -import org.opendaylight.controller.containermanager.ContainerData; - public class ContainerManager extends Authorization implements IContainerManager, IObjectReader, CommandProvider, ICacheUpdateAware, IContainerInternal, IContainerAuthorization, IConfigurationAware { @@ -734,7 +733,7 @@ public class ContainerManager extends Authorization implements IContaine * Read containers, container flows and finally containers' entries from file * and program the database accordingly */ - if (containerConfigs.isEmpty()) { + if ((clusterServices != null) && (clusterServices.amICoordinator())) { loadContainerConfig(); } } diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml index ee1ef12c11..c6d8c5911c 100644 --- a/opendaylight/containermanager/it.implementation/pom.xml +++ b/opendaylight/containermanager/it.implementation/pom.xml @@ -57,17 +57,14 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 17d484a88c..cdb4e35cdd 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -26,9 +26,7 @@ - - org.opendaylight.controller sal-common @@ -201,31 +199,6 @@ yang-jmx-generator ${config.version} - - org.opendaylight.controller - netty-event-executor-config - ${config.version} - - - org.opendaylight.controller - netty-threadgroup-config - ${config.version} - - - org.opendaylight.controller - threadpool-config-api - ${config.version} - - - org.opendaylight.controller - threadpool-config-impl - ${config.version} - - - org.opendaylight.controller - yang-store-api - ${config.version} - org.opendaylight.controller yang-store-api @@ -513,9 +486,22 @@ org.zeromq - jeromq - 0.3.1 - + jeromq + 0.3.1 + + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + org.opendaylight.yangtools.model + opendaylight-l2-types + @@ -543,7 +529,6 @@ org.opendaylight.controller sanitytest - ${controller.version} jar @@ -589,135 +574,108 @@ org.opendaylight.controller forwarding.staticrouting - ${forwarding.staticrouting} org.opendaylight.controller clustering.services - ${clustering.services.version} org.opendaylight.controller clustering.services-implementation - ${controller.version} - + org.opendaylight.controller configuration - ${controller.version} org.opendaylight.controller configuration.implementation - ${controller.version} org.opendaylight.controller routing.dijkstra_implementation - ${controller.version} - + org.opendaylight.controller arphandler - ${arphandler.version} org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${hosttracker.version} org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller containermanager.implementation - ${containermanager.version} org.opendaylight.controller appauth - ${controller.version} org.opendaylight.controller switchmanager - ${switchmanager.api.version} org.opendaylight.controller switchmanager.implementation - ${controller.version} org.opendaylight.controller statisticsmanager - ${statisticsmanager.version} org.opendaylight.controller statisticsmanager.implementation - ${controller.version} org.opendaylight.controller topologymanager - ${controller.version} org.opendaylight.controller usermanager - ${controller.version} org.opendaylight.controller usermanager.implementation - ${controller.version} org.opendaylight.controller connectionmanager - ${connectionmanager.version} org.opendaylight.controller connectionmanager.implementation - ${connectionmanager.version} org.opendaylight.controller security - ${controller.version} org.opendaylight.controller forwardingrulesmanager - ${forwardingrulesmanager.version} org.opendaylight.controller forwardingrulesmanager.implementation - ${controller.version} - org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller sal.implementation - ${controller.version} @@ -725,22 +683,18 @@ org.opendaylight.controller sal.connection - ${sal.connection.version} org.opendaylight.controller sal.connection.implementation - ${sal.connection.version} org.opendaylight.controller sal.networkconfiguration - ${sal.networkconfiguration.version} org.opendaylight.controller sal.networkconfiguration.implementation - ${sal.networkconfiguration.version} @@ -748,191 +702,150 @@ org.opendaylight.controller web - ${controller.version} org.opendaylight.controller flows.web - ${controller.version} org.opendaylight.controller devices.web - ${controller.version} org.opendaylight.controller troubleshoot.web - ${controller.version} org.opendaylight.controller topology.web - ${controller.version} org.opendaylight.controller osgi-brandfragment.web - 0.0.1-SNAPSHOT - org.opendaylight.controller networkconfig.neutron - ${controller.version} org.opendaylight.controller networkconfig.neutron.implementation - ${controller.version} org.opendaylight.controller networkconfig.neutron.northbound - ${controller.version} - org.opendaylight.controller commons.northbound - ${controller.version} org.opendaylight.controller bundlescanner - ${controller.version} org.opendaylight.controller bundlescanner.implementation - ${controller.version} org.opendaylight.controller topology.northbound - ${controller.version} org.opendaylight.controller forwarding.staticrouting.northbound - ${controller.version} org.opendaylight.controller statistics.northbound - ${controller.version} org.opendaylight.controller flowprogrammer.northbound - ${controller.version} org.opendaylight.controller hosttracker.northbound - ${controller.version} org.opendaylight.controller subnets.northbound - ${controller.version} org.opendaylight.controller switchmanager.northbound - ${controller.version} org.opendaylight.controller containermanager.northbound - ${controller.version} org.opendaylight.controller networkconfig.bridgedomain.northbound - ${networkconfig.bridgedomain.northbound.version} org.opendaylight.controller httpservice-bridge - 0.0.1-SNAPSHOT org.jolokia jolokia-osgi - ${jolokia.version} org.opendaylight.controller jolokia-bridge - ${jolokia.bridge.version} org.opendaylight.controller connectionmanager.northbound - ${connectionmanager.version} org.opendaylight.controller usermanager.northbound - 0.0.1-SNAPSHOT org.opendaylight.controller controllermanager.northbound - 0.0.1-SNAPSHOT org.opendaylight.controller logging.bridge - ${controller.version} org.opendaylight.controller protocol_plugins.openflow - ${controller.version} org.opendaylight.controller samples.loadbalancer - ${samples.loadbalancer} org.opendaylight.controller samples.loadbalancer.northbound - ${controller.version} org.opendaylight.controller samples.simpleforwarding - ${controller.version} - org.slf4j jcl-over-slf4j - - org.osgi - org.osgi.core - provided - org.slf4j slf4j-api - compile org.slf4j @@ -1105,8 +1018,6 @@ com.google.code.gson gson - 2.2.4 - compile org.jboss.spec.javax.transaction @@ -1201,26 +1112,6 @@ javax.resource - - org.ops4j.pax.exam - pax-exam-container-native - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - test - - - org.ops4j.pax.url - pax-url-aether - test - org.springframework org.springframework.asm @@ -1291,12 +1182,10 @@ com.sun.jersey jersey-core - ${jersey.version} com.sun.jersey jersey-server - ${jersey.version} com.sun.jersey @@ -1323,17 +1212,12 @@ org.eclipse.equinox.http servlet - org.apache.felix org.apache.felix.webconsole - 4.2.0 all - @@ -1353,19 +1237,6 @@ org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-yang-types - - - org.opendaylight.yangtools.model - opendaylight-l2-types - @@ -1389,29 +1260,17 @@ netty-common - - - - org.opendaylight.controller - clustering.test - ${controller.version} - + - org.opendaylight.controller - commons.httpclient - ${commons.httpclient.version} + org.opendaylight.controller + clustering.test - org.opendaylight.controller - sanitytest - ${controller.version} + commons.httpclient - - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml index 63ac8577ac..f7330cbfaf 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml @@ -137,25 +137,16 @@ - urn:opendaylight:l2:types?module=opendaylight-l2-types&revision=2013-08-27 - 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:eventexecutor?module=netty-event-executor&revision=2013-11-12 urn:opendaylight:params:xml:ns:yang:controller:threadpool?module=threadpool&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:md:sal:dom?module=opendaylight-md-sal-dom&revision=2013-10-28 - urn:opendaylight:params:xml:ns:yang:controller:config?module=config&revision=2013-04-05 - urn:ietf:params:netconf:capability:candidate:1.0 - urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&revision=2010-10-04 - urn:opendaylight:params:xml:ns:yang:controller:netty:eventexecutor?module=netty-event-executor&revision=2013-11-12 - urn:ietf:params:xml:ns:yang:rpc-context?module=rpc-context&revision=2013-06-17 urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl?module=opendaylight-sal-binding-broker-impl&revision=2013-10-28 - urn:ietf:params:xml:ns:yang:ietf-inet-types?module=ietf-inet-types&revision=2010-09-24 - urn:ietf:params:netconf:capability:rollback-on-error:1.0 - urn:ietf:params:xml:ns:yang:ietf-yang-types?module=ietf-yang-types&revision=2010-09-24 - urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl?module=threadpool-impl&revision=2013-04-05 urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&revision=2013-10-28 - urn:opendaylight:yang:extension:yang-ext?module=yang-ext&revision=2013-07-09 urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&revision=2013-10-28 urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store?module=odl-sal-dom-clustered-store-cfg&revision=2013-10-28 urn:opendaylight:params:xml:ns:yang:controller:md:sal:remote:rpc?module=odl-sal-dom-rpc-remote-cfg&revision=2013-10-28 + diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml index a0b7367acd..2a3c08e41f 100644 --- a/opendaylight/forwarding/staticrouting/pom.xml +++ b/opendaylight/forwarding/staticrouting/pom.xml @@ -62,22 +62,18 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller configuration - 0.4.1-SNAPSHOT junit @@ -86,7 +82,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java index 2ce2465d97..e6651b86a1 100644 --- a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java +++ b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java @@ -427,7 +427,7 @@ public class StaticRoutingImplementation implements IfNewHostNotify, IForwarding allocateCaches(); retrieveCaches(); this.executor = Executors.newFixedThreadPool(1); - if (staticRouteConfigs.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml index afd3d0ba7c..5583b7a0dd 100644 --- a/opendaylight/forwardingrulesmanager/api/pom.xml +++ b/opendaylight/forwardingrulesmanager/api/pom.xml @@ -68,17 +68,14 @@ org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller @@ -87,7 +84,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index ef69b49ca9..deaa23e062 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -74,7 +74,6 @@ org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java index 41075b9554..21b747beee 100644 --- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java +++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java @@ -2631,10 +2631,9 @@ public class ForwardingRulesManager implements } /* - * Read startup and build database if we have not already gotten the - * configurations synced from another node + * Read startup and build database if we are the coordinator */ - if (staticFlows.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadFlowConfiguration(); } } diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml index 1595f257d4..6fc318cd3a 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml @@ -21,102 +21,82 @@ org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${hosttracker.version} org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller connectionmanager.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller forwardingrulesmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index bf2e360334..fbd13e13ef 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -57,7 +57,6 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -66,12 +65,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index 78c4ae4160..f7ced8ee89 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -100,27 +100,22 @@ org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller connectionmanager.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -129,17 +124,14 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} junit diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml index 03e70002d3..c2d30e78c6 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/hosttracker/integrationtest/pom.xml @@ -21,78 +21,58 @@ org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${hosttracker.version} org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT - org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT - org.opendaylight.controller arphandler - ${arphandler.version} org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT - org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT - org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT - org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT - org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml index ba3da5f764..495058ff86 100644 --- a/opendaylight/hosttracker_new/api/pom.xml +++ b/opendaylight/hosttracker_new/api/pom.xml @@ -56,7 +56,6 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -65,12 +64,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml index c5caa7f317..c035be49ec 100644 --- a/opendaylight/hosttracker_new/implementation/pom.xml +++ b/opendaylight/hosttracker_new/implementation/pom.xml @@ -101,7 +101,6 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -110,17 +109,14 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller hosttracker_new - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 3c4c8e3bb5..acbdb9f33d 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -122,6 +122,7 @@ ${user.name}-private-view java 3.0.0 + 0.7.0-SNAPSHOT diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend index 5bc2d70c6a..b22f328778 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/dom/serializer/impl/TransformerGenerator.xtend @@ -408,7 +408,7 @@ class TransformerGenerator { method(Object, "deserialize", Object) [ bodyChecked = ''' { - ////System.out.println("«type.name»#deserialize: " +$1); + //System.out.println("«type.name»#deserialize: " +$1); java.util.Map.Entry _input = (java.util.Map.Entry) $1; return fromDomStatic((«QName.name»)_input.getKey(),_input.getValue()); } @@ -528,7 +528,7 @@ class TransformerGenerator { return null; } java.util.Map _compositeNode = (java.util.Map) $2; - System.out.println(_localQName + " " + _compositeNode); + //System.out.println(_localQName + " " + _compositeNode); «type.builderName» _builder = new «type.builderName»(); boolean _is_empty = true; «FOR child : node.childNodes» @@ -676,7 +676,7 @@ class TransformerGenerator { return null; } java.util.Map _compositeNode = (java.util.Map) $2; - System.out.println(_localQName + " " + _compositeNode); + //System.out.println(_localQName + " " + _compositeNode); «type.builderName» _builder = new «type.builderName»(); «deserializeKey(type, node)» «deserializeDataNodeContainerBody(type, node)» @@ -692,7 +692,7 @@ class TransformerGenerator { return null; } java.util.Map _compositeNode = (java.util.Map) $2; - System.out.println(_localQName + " " + _compositeNode); + //System.out.println(_localQName + " " + _compositeNode); «type.builderName» _builder = new «type.builderName»(); «deserializeDataNodeContainerBody(type, node)» «deserializeAugmentations» @@ -708,7 +708,7 @@ class TransformerGenerator { return null; } java.util.Map _compositeNode = (java.util.Map) $2; - System.out.println(_localQName + " " + _compositeNode); + //System.out.println(_localQName + " " + _compositeNode); «type.builderName» _builder = new «type.builderName»(); «deserializeDataNodeContainerBody(type, node)» «deserializeAugmentations» diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml index 0ce8520824..2557026ffb 100644 --- a/opendaylight/md-sal/sal-common-api/pom.xml +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.yangtools concepts - 0.1.1-SNAPSHOT + 0.6.0-SNAPSHOT org.osgi diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index adbe3d2a49..c65a2f51e5 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.yangtools concepts - 0.1.1-SNAPSHOT + 0.6.0-SNAPSHOT com.google.guava diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang b/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang index 2fae7ee021..2331516877 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/yang/odl-sal-netconf-connector-cfg.yang @@ -6,7 +6,6 @@ module odl-sal-netconf-connector-cfg { import config { prefix config; revision-date 2013-04-05; } import threadpool {prefix th;} import netty {prefix netty;} - import ietf-inet-types {prefix inet;} import opendaylight-md-sal-dom {prefix dom;} description diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java index 8956f37ce5..627e2a9ce1 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonMapper.java @@ -207,10 +207,15 @@ class JsonMapper { } writer.value(moduleName + ":" + valueFromDTO.getValue()); } else { + Object value = node.getValue(); logger.debug("Value of " + baseType.getQName().getNamespace() + ":" + baseType.getQName().getLocalName() + " is not instance of " + QName.class + " but is " - + node.getValue().getClass()); - writer.value(String.valueOf(node.getValue())); + + (value != null ? value.getClass() : "null")); + if (value == null) { + writer.value(""); + } else { + writer.value(String.valueOf(value)); + } } } else if (baseType instanceof DecimalTypeDefinition || baseType instanceof IntegerTypeDefinition || baseType instanceof UnsignedIntegerTypeDefinition) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend index d0099bb398..b26810347c 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend @@ -45,7 +45,7 @@ class ControllerContext implements SchemaServiceListener { val static NULL_VALUE = "null" val static MOUNT_MODULE = "yang-ext" val static MOUNT_NODE = "mount" - val static MOUNT = "yang-ext:mount" + public val static MOUNT = "yang-ext:mount" @Property var SchemaContext globalSchema; diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend index 0f53e56b84..b134f9bf6b 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend @@ -30,10 +30,12 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition import static javax.ws.rs.core.Response.Status.* +import org.opendaylight.yangtools.yang.model.api.SchemaContext class RestconfImpl implements RestconfService { val static RestconfImpl INSTANCE = new RestconfImpl + val static MOUNT_POINT_MODULE_NAME = "ietf-netconf" @Property BrokerFacade broker @@ -157,16 +159,30 @@ class RestconfImpl implements RestconfService { throw new ResponseException(BAD_REQUEST, "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)"); } - val uncompleteInstIdWithData = identifier.toInstanceIdentifier - val schemaNode = uncompleteInstIdWithData.mountPoint.findModule(payload)?.getSchemaChildNode(payload) - val value = normalizeNode(payload, schemaNode, uncompleteInstIdWithData.mountPoint) - val completeInstIdWithData = uncompleteInstIdWithData.addLastIdentifierFromData(value, schemaNode) + var InstanceIdWithSchemaNode iiWithData; + var CompositeNode value; + if (payload.representsMountPointRootData) { // payload represents mount point data and URI represents path to the mount point + if (identifier.endsWithMountPoint) { + throw new ResponseException(BAD_REQUEST, + "URI has bad format. URI should be without \"" + ControllerContext.MOUNT + "\" for POST operation."); + } + val completIdentifier = identifier.addMountPointIdentifier + iiWithData = completIdentifier.toInstanceIdentifier + value = normalizeNode(payload, iiWithData.schemaNode, iiWithData.mountPoint) + } else { + val uncompleteInstIdWithData = identifier.toInstanceIdentifier + val parentSchema = uncompleteInstIdWithData.schemaNode as DataNodeContainer + val namespace = uncompleteInstIdWithData.mountPoint.findModule(payload)?.namespace + val schemaNode = parentSchema.findInstanceDataChild(payload.name, namespace) + value = normalizeNode(payload, schemaNode, uncompleteInstIdWithData.mountPoint) + iiWithData = uncompleteInstIdWithData.addLastIdentifierFromData(value, schemaNode) + } var RpcResult status = null - if (completeInstIdWithData.mountPoint !== null) { - status = broker.commitConfigurationDataPostBehindMountPoint(completeInstIdWithData.mountPoint, - completeInstIdWithData.instanceIdentifier, value)?.get(); + if (iiWithData.mountPoint !== null) { + status = broker.commitConfigurationDataPostBehindMountPoint(iiWithData.mountPoint, + iiWithData.instanceIdentifier, value)?.get(); } else { - status = broker.commitConfigurationDataPost(completeInstIdWithData.instanceIdentifier, value)?.get(); + status = broker.commitConfigurationDataPost(iiWithData.instanceIdentifier, value)?.get(); } if (status === null) { return Response.status(ACCEPTED).build @@ -182,7 +198,12 @@ class RestconfImpl implements RestconfService { throw new ResponseException(BAD_REQUEST, "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)"); } - val schemaNode = findModule(null, payload)?.getSchemaChildNode(payload) + val module = findModule(null, payload) + if (module === null) { + throw new ResponseException(BAD_REQUEST, + "Data has bad format. Root element node has incorrect namespace (XML format) or module name(JSON format)"); + } + val schemaNode = module.findInstanceDataChild(payload.name, module.namespace) val value = normalizeNode(payload, schemaNode, null) val iiWithData = addLastIdentifierFromData(null, value, schemaNode) var RpcResult status = null @@ -223,6 +244,14 @@ class RestconfImpl implements RestconfService { private def dispatch URI namespace(CompositeNodeWrapper data) { return data.namespace } + + private def dispatch String localName(CompositeNode data) { + return data.nodeType.localName + } + + private def dispatch String localName(CompositeNodeWrapper data) { + return data.localName + } private def dispatch Module findModule(MountInstance mountPoint, CompositeNode data) { if (mountPoint !== null) { @@ -249,14 +278,14 @@ class RestconfImpl implements RestconfService { return module } - private def dispatch DataSchemaNode getSchemaChildNode(DataNodeContainer parentSchemaNode, CompositeNode data) { - return parentSchemaNode?.getDataChildByName(data.nodeType.localName) + private def dispatch getName(CompositeNode data) { + return data.nodeType.localName } - private def dispatch DataSchemaNode getSchemaChildNode(DataNodeContainer parentSchemaNode, CompositeNodeWrapper data) { - return parentSchemaNode?.getDataChildByName(data.localName) + private def dispatch getName(CompositeNodeWrapper data) { + return data.localName } - + private def InstanceIdWithSchemaNode addLastIdentifierFromData(InstanceIdWithSchemaNode identifierWithSchemaNode, CompositeNode data, DataSchemaNode schemaOfData) { val iiOriginal = identifierWithSchemaNode?.instanceIdentifier @@ -288,7 +317,23 @@ class RestconfImpl implements RestconfService { } return keyValues } - + + private def endsWithMountPoint(String identifier) { + return (identifier.endsWith(ControllerContext.MOUNT) || identifier.endsWith(ControllerContext.MOUNT + "/")) + } + + private def representsMountPointRootData(CompositeNode data) { + return ((data.namespace == SchemaContext.NAME.namespace || data.namespace == MOUNT_POINT_MODULE_NAME) && + data.localName == SchemaContext.NAME.localName) + } + + private def addMountPointIdentifier(String identifier) { + if (identifier.endsWith("/")) { + return identifier + ControllerContext.MOUNT + } + return identifier + "/" + ControllerContext.MOUNT + } + private def CompositeNode normalizeNode(CompositeNode node, DataSchemaNode schema, MountInstance mountPoint) { if (schema === null) { throw new ResponseException(INTERNAL_SERVER_ERROR, "Data schema node was not found for " + node?.nodeType?.localName) @@ -304,7 +349,7 @@ class RestconfImpl implements RestconfService { } return node } - + private def void normalizeNode(NodeWrapper nodeBuilder, DataSchemaNode schema, QName previousAugment, MountInstance mountPoint) { if (schema === null) { @@ -325,7 +370,7 @@ class RestconfImpl implements RestconfService { moduleName = controllerContext.findModuleNameByNamespace(mountPoint, validQName.namespace) } if (nodeBuilder.namespace === null || nodeBuilder.namespace == validQName.namespace || - nodeBuilder.namespace.toString == moduleName) { + nodeBuilder.namespace.toString == moduleName || nodeBuilder.namespace == MOUNT_POINT_MODULE_NAME) { nodeBuilder.qname = validQName } else { throw new ResponseException(BAD_REQUEST, diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonToCnSnTest.java index afe458d6e0..3a90e73acb 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonToCnSnTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/json/to/cnsn/test/JsonToCnSnTest.java @@ -1,6 +1,7 @@ package org.opendaylight.controller.sal.restconf.impl.json.to.cnsn.test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -10,9 +11,11 @@ import java.util.Set; import javax.ws.rs.WebApplicationException; +import org.junit.Ignore; import org.junit.Test; import org.opendaylight.controller.sal.rest.impl.JsonToCompositeNodeProvider; import org.opendaylight.controller.sal.restconf.impl.CompositeNodeWrapper; +import org.opendaylight.controller.sal.restconf.impl.ResponseException; import org.opendaylight.controller.sal.restconf.impl.test.TestUtils; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; @@ -264,9 +267,28 @@ public class JsonToCnSnTest { assertEquals("iden_local", ((QName) lf14.getValue()).getLocalName()); assertEquals("identity:module", ((QName) lf14.getValue()).getNamespace().toString()); } + + @Ignore + @Test + public void loadDataAugmentedSchemaMoreEqualNamesTest() { + boolean exceptionCaught = false; + try { + loadAndNormalizeData("/common/augment/json/dataa.json", "/common/augment/yang", "cont", "main"); + loadAndNormalizeData("/common/augment/json/datab.json", "/common/augment/yang", "cont", "main"); + } catch (ResponseException e) { + exceptionCaught = true; + } + + assertFalse(exceptionCaught); + } private void simpleTest(String jsonPath, String yangPath, String topLevelElementName, String namespace, String moduleName) { + CompositeNode compNode = loadAndNormalizeData(jsonPath, yangPath, topLevelElementName, moduleName); + verifyCompositeNode(compNode, namespace); + } + + private CompositeNode loadAndNormalizeData(String jsonPath, String yangPath, String topLevelElementName, String moduleName) { CompositeNode compositeNode = TestUtils.readInputToCnSn(jsonPath, false, JsonToCompositeNodeProvider.INSTANCE); assertNotNull(compositeNode); @@ -280,7 +302,7 @@ public class JsonToCnSnTest { CompositeNode compNode = ((CompositeNodeWrapper) compositeNode).unwrap(); assertEquals(topLevelElementName, compNode.getNodeType().getLocalName()); - verifyCompositeNode(compNode, namespace); + return compNode; } private void verityMultipleItemsInList(CompositeNode compositeNode) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java new file mode 100644 index 0000000000..5650be57ce --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java @@ -0,0 +1,45 @@ +package org.opendaylight.controller.sal.restconf.impl.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import java.io.FileNotFoundException; +import java.io.UnsupportedEncodingException; +import java.net.URISyntaxException; + +import org.junit.Ignore; +import org.junit.Test; +import org.opendaylight.controller.sal.restconf.impl.ControllerContext; +import org.opendaylight.controller.sal.restconf.impl.InstanceIdWithSchemaNode; +import org.opendaylight.controller.sal.restconf.impl.ResponseException; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; + +public class RestGetAugmentedElementWhenEqualNamesTest { + + @Ignore + @Test + public void getDataWithUrlMountPoint() throws UnsupportedEncodingException, URISyntaxException, + FileNotFoundException { + boolean exceptionCaught = false; + + SchemaContext schemaContextTestModule = TestUtils.loadSchemaContext("/common/augment/yang"); + ControllerContext controllerContext = ControllerContext.getInstance(); + controllerContext.setSchemas(schemaContextTestModule); + + try { + InstanceIdWithSchemaNode instanceIdentifierA = controllerContext + .toInstanceIdentifier("main:cont/augment-main-a:cont1"); + InstanceIdWithSchemaNode instanceIdentifierB = controllerContext + .toInstanceIdentifier("main:cont/augment-main-b:cont1"); + + assertEquals("ns:augment:main:a", instanceIdentifierA.getSchemaNode().getQName().getNamespace().toString()); + assertEquals("ns:augment:main:b", instanceIdentifierB.getSchemaNode().getQName().getNamespace()); + } catch (ResponseException e) { + exceptionCaught = true; + } + + assertFalse(exceptionCaught); + + } + +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index 833d030b92..819b5f8213 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -43,9 +43,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class RestPostOperationTest extends JerseyTest { private static String xmlDataAbsolutePath; + private static String xmlDataInterfaceAbsolutePath; private static String xmlDataRpcInput; private static CompositeNodeWrapper cnSnDataOutput; private static String xmlData2; + private static String xmlData3; private static ControllerContext controllerContext; private static BrokerFacade brokerFacade; @@ -115,13 +117,13 @@ public class RestPostOperationTest extends JerseyTest { controllerContext.setSchemas(schemaContextYangsIetf); mockCommitConfigurationDataPostMethod(TransactionStatus.COMMITED); String uri = createUri("/config/", "ietf-interfaces:interfaces"); - assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); mockCommitConfigurationDataPostMethod(null); - assertEquals(202, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(202, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); mockCommitConfigurationDataPostMethod(TransactionStatus.FAILED); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); } @Test @@ -129,13 +131,13 @@ public class RestPostOperationTest extends JerseyTest { controllerContext.setSchemas(schemaContextYangsIetf); mockCommitConfigurationDataPostMethod(TransactionStatus.COMMITED); String uri = createUri("/datastore/", "ietf-interfaces:interfaces"); - assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(204, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); mockCommitConfigurationDataPostMethod(null); - assertEquals(202, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(202, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); mockCommitConfigurationDataPostMethod(TransactionStatus.FAILED); - assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataAbsolutePath)); + assertEquals(500, post(uri, MediaType.APPLICATION_XML, xmlDataInterfaceAbsolutePath)); } @Test @@ -154,8 +156,10 @@ public class RestPostOperationTest extends JerseyTest { ControllerContext.getInstance().setMountService(mockMountService); - String uri = createUri("/config/", "ietf-interfaces:interfaces/interface/0/yang-ext:mount/test-module:cont/cont1"); + String uri = createUri("/config/", "ietf-interfaces:interfaces/interface/0/yang-ext:mount"); assertEquals(204, post(uri, Draft02.MediaTypes.DATA + XML, xmlData2)); + uri = createUri("/config/", "ietf-interfaces:interfaces/interface/0/yang-ext:mount/test-module:cont"); + assertEquals(204, post(uri, Draft02.MediaTypes.DATA + XML, xmlData3)); } private void mockInvokeRpc(CompositeNode result, boolean sucessful) { @@ -185,12 +189,16 @@ public class RestPostOperationTest extends JerseyTest { private static void loadData() throws IOException, URISyntaxException { InputStream xmlStream = RestconfImplTest.class.getResourceAsStream("/parts/ietf-interfaces_interfaces_absolute_path.xml"); xmlDataAbsolutePath = TestUtils.getDocumentInPrintableForm(TestUtils.loadDocumentFrom(xmlStream)); + xmlStream = RestconfImplTest.class.getResourceAsStream("/parts/ietf-interfaces_interfaces_interface_absolute_path.xml"); + xmlDataInterfaceAbsolutePath = TestUtils.getDocumentInPrintableForm(TestUtils.loadDocumentFrom(xmlStream)); String xmlPathRpcInput = RestconfImplTest.class.getResource("/full-versions/test-data2/data-rpc-input.xml") .getPath(); xmlDataRpcInput = TestUtils.loadTextFile(xmlPathRpcInput); cnSnDataOutput = prepareCnSnRpcOutput(); String data2Input = RestconfImplTest.class.getResource("/full-versions/test-data2/data2.xml").getPath(); xmlData2 = TestUtils.loadTextFile(data2Input); + String data3Input = RestconfImplTest.class.getResource("/full-versions/test-data2/data3.xml").getPath(); + xmlData3 = TestUtils.loadTextFile(data3Input); } private static CompositeNodeWrapper prepareCnSnRpcOutput() throws URISyntaxException { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java new file mode 100644 index 0000000000..421a936d2d --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/xml/to/cnsn/test/XmlAugmentedElementToCnSnTest.java @@ -0,0 +1,44 @@ +package org.opendaylight.controller.sal.restconf.impl.xml.to.cnsn.test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.Set; + +import org.junit.Ignore; +import org.junit.Test; +import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; +import org.opendaylight.controller.sal.restconf.impl.ResponseException; +import org.opendaylight.controller.sal.restconf.impl.test.TestUtils; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.model.api.Module; + +public class XmlAugmentedElementToCnSnTest { + + @Ignore + @Test + public void loadDataAugmentedSchemaMoreEqualNamesTest() { + boolean exceptionCaught = false; + try { + loadAndNormalizeData("/common/augment/xml/dataa.xml", "/common/augment/yang", "main","cont"); + loadAndNormalizeData("/common/augment/xml/datab.xml", "/common/augment/yang", "main","cont"); + } catch (ResponseException e) { + exceptionCaught = true; + } + + assertFalse(exceptionCaught); + } + + + private void loadAndNormalizeData(String xmlPath, String yangPath, String topLevelElementName, String moduleName) { + CompositeNode compNode = TestUtils.readInputToCnSn(xmlPath, false, + XmlToCompositeNodeProvider.INSTANCE); + assertNotNull(compNode); + Set modules = TestUtils.loadModulesFrom(yangPath); + + assertNotNull(modules); + TestUtils.normalizeCompositeNode(compNode, modules, topLevelElementName + ":" + moduleName); + } + + +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/dataa.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/dataa.json new file mode 100644 index 0000000000..6097bd11b1 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/dataa.json @@ -0,0 +1,7 @@ +{ + "main:cont":{ + "augment-main-a:cont1":{ + "lf11":"lf11 value from a" + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/datab.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/datab.json new file mode 100644 index 0000000000..297584a905 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/json/datab.json @@ -0,0 +1,7 @@ +{ + "main:cont":{ + "augment-main-b:cont1":{ + "lf11":"lf11 value from b" + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/dataa.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/dataa.xml new file mode 100644 index 0000000000..97c5ae5246 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/dataa.xml @@ -0,0 +1,5 @@ + + + lf11 value for a + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/datab.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/datab.xml new file mode 100644 index 0000000000..b7696ca2a0 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/xml/datab.xml @@ -0,0 +1,5 @@ + + + lf11 value for b + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-a.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-a.yang new file mode 100644 index 0000000000..aa3bf3f253 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-a.yang @@ -0,0 +1,20 @@ +module augment-main-a { + namespace "ns:augment:main:a"; + prefix "aumaa"; + + + import main {prefix mn; revision-date 2014-01-21;} + + + revision "2014-01-21" { + } + + augment "/mn:cont" { + container cont1 { + leaf lf11 { + type string; + } + } + } + +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-b.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-b.yang new file mode 100644 index 0000000000..dcf493df08 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/augment-main-b.yang @@ -0,0 +1,20 @@ +module augment-main-b { + namespace "ns:augment:main:b"; + prefix "aumab"; + + + import main {prefix mn; revision-date 2014-01-21;} + + + revision "2014-01-21" { + } + + augment "/mn:cont" { + container cont1 { + leaf lf11 { + type string; + } + } + } + +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/main.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/main.yang new file mode 100644 index 0000000000..e2917223a4 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/common/augment/yang/main.yang @@ -0,0 +1,10 @@ +module main { + namespace "ns:main"; + prefix "ma"; + + revision "2014-01-21" { + } + + container cont { + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/full-versions/test-data2/data3.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/full-versions/test-data2/data3.xml new file mode 100644 index 0000000000..b7b05d1ea2 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/full-versions/test-data2/data3.xml @@ -0,0 +1,4 @@ + + lf1 data + lf2 data + diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml new file mode 100644 index 0000000000..19569b5598 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/parts/ietf-interfaces_interfaces_interface_absolute_path.xml @@ -0,0 +1,6 @@ + + eth0 + ethernetCsmacd + false + some interface + diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java index 7cd43bd79a..6eabbe69c6 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java @@ -26,8 +26,8 @@ import org.opendaylight.controller.netconf.mapping.api.NetconfOperationFilter; import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService; import org.opendaylight.yangtools.yang.model.api.Module; -import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -100,16 +100,15 @@ public class NetconfOperationServiceImpl implements NetconfOperationService { } private static Set setupCapabilities(YangStoreSnapshot yangStoreSnapshot) { - Set capabilities = Sets.newHashSet(); - + Set capabilities = new HashSet<>(); // [RFC6241] 8.3. Candidate Configuration Capability capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:candidate:1.0")); // [RFC6241] 8.5. Rollback-on-Error Capability capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:rollback-on-error:1.0")); - final Collection> modulesAndContents = yangStoreSnapshot.getModuleMap().values(); - for (Map.Entry moduleAndContent : modulesAndContents) { - capabilities.add(new YangStoreCapability(moduleAndContent)); + Set modules = yangStoreSnapshot.getModules(); + for (Module module : modules) { + capabilities.add(new YangStoreCapability(module, yangStoreSnapshot.getModuleSource(module))); } return capabilities; @@ -161,10 +160,9 @@ public class NetconfOperationServiceImpl implements NetconfOperationService { private final String moduleName; private final String moduleNamespace; - public YangStoreCapability(Map.Entry moduleAndContent) { - super(getAsString(moduleAndContent.getKey())); - this.content = moduleAndContent.getValue(); - Module module = moduleAndContent.getKey(); + public YangStoreCapability(Module module, String moduleContent) { + super(getAsString(module)); + this.content = moduleContent; this.moduleName = module.getName(); this.moduleNamespace = module.getNamespace().toString(); this.revision = Util.writeDate(module.getRevision()); diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/CapabilityProviderImpl.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/CapabilityProviderImpl.java index 8dbdb26bff..e0d7e319be 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/CapabilityProviderImpl.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/CapabilityProviderImpl.java @@ -18,9 +18,12 @@ import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeSet; public class CapabilityProviderImpl implements CapabilityProvider { private final NetconfOperationServiceSnapshot netconfOperationServiceSnapshot; @@ -31,7 +34,9 @@ public class CapabilityProviderImpl implements CapabilityProvider { public CapabilityProviderImpl(NetconfOperationServiceSnapshot netconfOperationServiceSnapshot) { this.netconfOperationServiceSnapshot = netconfOperationServiceSnapshot; Map urisToCapabilitiesInternalMap = getCapabilitiesInternal(netconfOperationServiceSnapshot); - capabilityURIs = Collections.unmodifiableSet(urisToCapabilitiesInternalMap.keySet()); + List capabilityURIs = new ArrayList<>(urisToCapabilitiesInternalMap.keySet()); + Collections.sort(capabilityURIs); + this.capabilityURIs = Collections.unmodifiableSet(new TreeSet<>(capabilityURIs)); } private static Map getCapabilitiesInternal( diff --git a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java index 8d3476f4b8..958ac42398 100644 --- a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java +++ b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/ConcurrentClientsTest.java @@ -95,7 +95,6 @@ public class ConcurrentClientsTest { final YangStoreSnapshot yStore = mock(YangStoreSnapshot.class); doReturn(yStore).when(this.yangStoreService).getYangStoreSnapshot(); doReturn(Collections.emptyMap()).when(yStore).getModuleMXBeanEntryMap(); - doReturn(Collections.emptyMap()).when(yStore).getModuleMap(); final ConfigTransactionJMXClient mockedTCl = mock(ConfigTransactionJMXClient.class); doReturn(mockedTCl).when(this.jmxClient).getConfigTransactionClient(any(ObjectName.class)); diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml index 150f602802..c5c231d652 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml +++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml @@ -77,22 +77,18 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller networkconfig.neutron - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java index ceb009bf2c..b1b2610134 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java @@ -17,8 +17,8 @@ import java.util.Dictionary; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -117,7 +117,7 @@ public class NeutronFloatingIPInterface implements INeutronFloatingIPCRUD, IConf private void startUp() { allocateCache(); retrieveCache(); - if (floatingIPDB.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } } diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java index de9b9d1bc4..eda4d21d5d 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java @@ -17,8 +17,8 @@ import java.util.Dictionary; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -99,7 +99,7 @@ public class NeutronNetworkInterface implements INeutronNetworkCRUD, IConfigurat private void startUp() { allocateCache(); retrieveCache(); - if (networkDB.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } } diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java index ec439bb927..a49888f6c3 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java @@ -18,8 +18,8 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -118,7 +118,7 @@ public class NeutronPortInterface implements INeutronPortCRUD, IConfigurationCon private void startUp() { allocateCache(); retrieveCache(); - if (portDB.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java index 850cc02163..9f8aa1937f 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java @@ -17,8 +17,8 @@ import java.util.Dictionary; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -110,7 +110,7 @@ public class NeutronRouterInterface implements INeutronRouterCRUD, IConfiguratio private void startUp() { allocateCache(); retrieveCache(); - if (routerDB.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java index f908a95c31..049fd3283d 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java @@ -17,8 +17,8 @@ import java.util.Dictionary; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -115,7 +115,7 @@ public class NeutronSubnetInterface implements INeutronSubnetCRUD, IConfiguratio private void startUp() { allocateCache(); retrieveCache(); - if (subnetDB.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadConfiguration(); } diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml index b6cdd2512b..cdbb7d6b81 100644 --- a/opendaylight/networkconfiguration/neutron/pom.xml +++ b/opendaylight/networkconfiguration/neutron/pom.xml @@ -43,7 +43,7 @@ org.apache.felix maven-bundle-plugin - 2.3.6 + ${bundle.plugin.version} true @@ -67,12 +67,10 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT commons-net diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml index 03cb9c20de..a3d53ed011 100644 --- a/opendaylight/northbound/bundlescanner/implementation/pom.xml +++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml @@ -53,7 +53,6 @@ org.ow2.asm asm-all - 4.1 junit @@ -67,12 +66,10 @@ org.opendaylight.controller bundlescanner - ${bundlescanner.version} org.opendaylight.controller sal - ${sal.version} diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 2169f3f3e7..70bd0d4734 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -72,17 +72,14 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller usermanager - ${usermanager.version} org.opendaylight.controller bundlescanner - ${bundlescanner.version} @@ -122,13 +119,10 @@ com.sun.jersey jersey-server - ${jersey.version} com.sun.jersey jersey-client - ${jersey.version} - diff --git a/opendaylight/northbound/connectionmanager/pom.xml b/opendaylight/northbound/connectionmanager/pom.xml index 8ade6134e6..8fed221bf8 100644 --- a/opendaylight/northbound/connectionmanager/pom.xml +++ b/opendaylight/northbound/connectionmanager/pom.xml @@ -76,32 +76,26 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller sal.connection - ${sal.connection.version} org.opendaylight.controller connectionmanager - ${connectionmanager.version} org.opendaylight.controller containermanager - ${containermanager.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml index a8b8f2a5d0..7cc3964713 100644 --- a/opendaylight/northbound/containermanager/pom.xml +++ b/opendaylight/northbound/containermanager/pom.xml @@ -67,32 +67,26 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller appauth - 0.4.1-SNAPSHOT org.opendaylight.controller web - 0.4.1-SNAPSHOT org.opendaylight.controller sal - ${sal.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} diff --git a/opendaylight/northbound/controllermanager/pom.xml b/opendaylight/northbound/controllermanager/pom.xml index 5baaeb0dcc..866f166c4b 100644 --- a/opendaylight/northbound/controllermanager/pom.xml +++ b/opendaylight/northbound/controllermanager/pom.xml @@ -77,43 +77,26 @@ org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet - ${jersey-servlet.version} - org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller switchmanager - ${switchmanager.api.version} - org.opendaylight.controller sal - ${sal.version} - org.opendaylight.controller commons.northbound - ${commons.northbound.version} - - - org.springframework - spring-web - ${spring.version} - provided - - org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} junit @@ -122,7 +105,6 @@ org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - ${corsfilter.version} diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index 565bd5f6aa..2948237007 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -75,7 +75,6 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller @@ -84,22 +83,18 @@ org.opendaylight.controller forwardingrulesmanager - ${forwardingrulesmanager.version} org.opendaylight.controller sal - ${sal.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} junit diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index aab519e5f6..54a1fa025e 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -75,12 +75,10 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller @@ -89,17 +87,14 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} junit diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml index d1815bbf8c..d5283e35a9 100644 --- a/opendaylight/northbound/integrationtest/pom.xml +++ b/opendaylight/northbound/integrationtest/pom.xml @@ -34,237 +34,191 @@ org.opendaylight.controller commons.httpclient - 0.1.1-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller connectionmanager.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller forwarding.staticrouting - ${forwarding.staticrouting} org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services-implementation - 0.4.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller routing.dijkstra_implementation - 0.4.1-SNAPSHOT org.opendaylight.controller arphandler - ${arphandler.version} org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller forwardingrulesmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${hosttracker.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT org.opendaylight.controller statisticsmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT org.opendaylight.controller usermanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller security - 0.4.1-SNAPSHOT org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller topology.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller forwarding.staticrouting.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller statistics.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller flowprogrammer.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller subnets.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller logging.bridge - 0.4.1-SNAPSHOT org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT org.opendaylight.controller bundlescanner - 0.4.1-SNAPSHOT org.opendaylight.controller bundlescanner.implementation - 0.4.1-SNAPSHOT org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.slf4j jcl-over-slf4j - ${slf4j.version} org.slf4j slf4j-api - ${slf4j.version} org.slf4j log4j-over-slf4j - ${slf4j.version} ch.qos.logback logback-core - ${logback.version} ch.qos.logback logback-classic - ${logback.version} @@ -295,7 +249,6 @@ org.codehaus.jettison jettison - 1.3.3 commons-io @@ -304,381 +257,305 @@ commons-fileupload commons-fileupload - 1.2.2 commons-codec commons-codec - 1.8 equinoxSDK381 javax.servlet - 3.0.0.v201112011016 equinoxSDK381 javax.servlet.jsp - 2.2.0.v201112011158 equinoxSDK381 org.eclipse.equinox.ds - 1.4.0.v20120522-1841 equinoxSDK381 org.eclipse.equinox.util - 1.0.400.v20120522-2049 equinoxSDK381 org.eclipse.osgi.services - 3.3.100.v20120522-1822 equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 equinoxSDK381 org.apache.felix.gogo.command - 0.8.0.v201108120515 equinoxSDK381 org.apache.felix.gogo.runtime - 0.8.0.v201108120515 equinoxSDK381 org.apache.felix.gogo.shell - 0.8.0.v201110170705 equinoxSDK381 org.eclipse.equinox.cm - 1.0.400.v20120522-1841 equinoxSDK381 org.eclipse.equinox.console - 1.0.0.v20120522-1841 equinoxSDK381 org.eclipse.equinox.launcher - 1.3.0.v20120522-1813 geminiweb org.eclipse.gemini.web.core - ${geminiweb.version} geminiweb org.eclipse.gemini.web.extender - ${geminiweb.version} geminiweb org.eclipse.gemini.web.tomcat - ${geminiweb.version} geminiweb org.eclipse.virgo.kernel.equinox.extensions - ${virgo.version} geminiweb org.eclipse.virgo.util.common - ${virgo.version} geminiweb org.eclipse.virgo.util.io - ${virgo.version} geminiweb org.eclipse.virgo.util.math - ${virgo.version} geminiweb org.eclipse.virgo.util.osgi - ${virgo.version} geminiweb org.eclipse.virgo.util.osgi.manifest - ${virgo.version} geminiweb org.eclipse.virgo.util.parser.manifest - ${virgo.version} org.apache.felix org.apache.felix.dependencymanager - 3.1.0 org.apache.felix org.apache.felix.dependencymanager.shell - 3.0.1 com.google.code.gson gson - 2.1 compile org.jboss.spec.javax.transaction jboss-transaction-api_1.1_spec - 1.0.1.Final org.apache.felix org.apache.felix.fileinstall - 3.1.6 org.apache.commons commons-lang3 - ${commons.lang.version} virgomirror org.eclipse.jdt.core.compiler.batch - 3.8.0.I20120518-2145 eclipselink javax.persistence - 2.0.4.v201112161009 orbit javax.activation - 1.1.0.v201211130549 orbit javax.annotation - 1.1.0.v201209060031 orbit javax.ejb - 3.1.1.v201204261316 orbit javax.el - 2.2.0.v201108011116 orbit javax.mail.glassfish - 1.4.1.v201108011116 orbit javax.xml.rpc - 1.1.0.v201005080400 orbit org.apache.catalina - 7.0.32.v201211201336 orbit org.apache.catalina.ha - 7.0.32.v201211201952 orbit org.apache.catalina.tribes - 7.0.32.v201211201952 orbit org.apache.coyote - 7.0.32.v201211201952 orbit org.apache.el - 7.0.32.v201211081135 orbit org.apache.jasper - 7.0.32.v201211201952 orbit org.apache.juli.extras - 7.0.32.v201211081135 orbit org.apache.tomcat.api - 7.0.32.v201211081135 orbit org.apache.tomcat.util - 7.0.32.v201211201952 orbit javax.servlet.jsp.jstl - 1.2.0.v201105211821 orbit javax.servlet.jsp.jstl.impl - 1.2.0.v201210211230 org.ops4j.pax.exam pax-exam-container-native - ${exam.version} test org.ops4j.pax.exam pax-exam-junit4 - ${exam.version} test org.ops4j.pax.exam pax-exam-link-mvn - ${exam.version} test org.ops4j.pax.url pax-url-aether - ${url.version} test org.ow2.asm asm-all - 4.1 org.springframework org.springframework.asm - ${spring.version} org.springframework org.springframework.aop - ${spring.version} org.springframework org.springframework.context - ${spring.version} org.springframework org.springframework.context.support - ${spring.version} org.springframework org.springframework.core - ${spring.version} org.springframework org.springframework.beans - ${spring.version} org.springframework org.springframework.expression - ${spring.version} org.springframework org.springframework.web - ${spring.version} org.aopalliance com.springsource.org.aopalliance - 1.0.0 org.springframework org.springframework.web.servlet - ${spring.version} org.springframework.security spring-security-config - ${spring-security.version} org.springframework.security spring-security-core - ${spring-security.version} org.springframework.security spring-security-web - ${spring-security.version} org.springframework.security spring-security-taglibs - ${spring-security.version} org.springframework org.springframework.transaction - ${spring-security.version} org.ow2.chameleon.management chameleon-mbeans - 1.0.0 com.sun.jersey jersey-core - ${jersey.version} - com.sun.jersey jersey-server - ${jersey.version} com.sun.jersey jersey-client - ${jersey.version} - eclipselink javax.resource diff --git a/opendaylight/northbound/java-client/pom.xml b/opendaylight/northbound/java-client/pom.xml index 78da7bdcc0..48bbdc6091 100644 --- a/opendaylight/northbound/java-client/pom.xml +++ b/opendaylight/northbound/java-client/pom.xml @@ -169,69 +169,56 @@ org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller connectionmanager.northbound - 0.1.1-SNAPSHOT org.opendaylight.controller controllermanager.northbound - 0.0.1-SNAPSHOT org.opendaylight.controller flowprogrammer.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller networkconfig.bridgedomain.northbound - 0.0.2-SNAPSHOT org.opendaylight.controller networkconfig.neutron.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller forwarding.staticrouting.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller statistics.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller subnets.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller topology.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller usermanager.northbound - 0.0.1-SNAPSHOT diff --git a/opendaylight/northbound/jolokia/pom.xml b/opendaylight/northbound/jolokia/pom.xml index 7e13f2e334..1ff43834b1 100644 --- a/opendaylight/northbound/jolokia/pom.xml +++ b/opendaylight/northbound/jolokia/pom.xml @@ -9,8 +9,8 @@ jolokia-bridge - ${jolokia.bridge.version} Jolokia bridge web application + 0.0.1-SNAPSHOT bundle @@ -18,7 +18,7 @@ org.apache.felix maven-bundle-plugin - 2.4.0 + ${bundle.plugin.version} true diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml index 483d993d04..9792de1dbe 100644 --- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml +++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml @@ -77,37 +77,30 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller sal.connection - ${sal.connection.version} org.opendaylight.controller sal.networkconfiguration - ${sal.networkconfiguration.version} org.opendaylight.controller connectionmanager - ${connectionmanager.version} org.opendaylight.controller containermanager - ${containermanager.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml index d54f2c5b28..be934d2627 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml +++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml @@ -89,42 +89,34 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.opendaylight.controller networkconfig.neutron - 0.4.1-SNAPSHOT org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.eclipse.persistence org.eclipse.persistence.moxy - 2.5.0 org.eclipse.persistence org.eclipse.persistence.core - 2.5.0 org.eclipse.persistence org.eclipse.persistence.antlr - 2.5.0 com.sun.jersey diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index c020e6b2a2..71e45de0b3 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -75,27 +75,22 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller forwarding.staticrouting - ${forwarding.staticrouting} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} junit diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 95410b0d3a..db15c9c7ab 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -83,27 +83,22 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller statisticsmanager - ${statisticsmanager.version} org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} junit diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index c7108b2efa..e46350f0ea 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -90,12 +90,10 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller @@ -104,12 +102,10 @@ org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} junit diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index a1932f521b..faa75a9e57 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -75,38 +75,23 @@ org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller switchmanager - org.opendaylight.controller sal - ${sal.version} - org.opendaylight.controller commons.northbound - ${commons.northbound.version} - - - org.springframework - spring-web - ${spring.version} - provided - - org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} - junit junit diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 4cdfb02d58..98ccd97a47 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -79,27 +79,22 @@ org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} org.opendaylight.controller containermanager - ${containermanager.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller topologymanager - ${topologymanager.version} junit diff --git a/opendaylight/northbound/usermanager/pom.xml b/opendaylight/northbound/usermanager/pom.xml index b48d67252e..c8231f144e 100644 --- a/opendaylight/northbound/usermanager/pom.xml +++ b/opendaylight/northbound/usermanager/pom.xml @@ -65,27 +65,22 @@ org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller usermanager - ${usermanager.version} org.opendaylight.controller commons.northbound - ${commons.northbound.version} org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} junit junit - ${junit.version} test diff --git a/opendaylight/northboundtest/unit_test_suite/pom.xml b/opendaylight/northboundtest/unit_test_suite/pom.xml index a9990abd97..5a0f5f3254 100644 --- a/opendaylight/northboundtest/unit_test_suite/pom.xml +++ b/opendaylight/northboundtest/unit_test_suite/pom.xml @@ -47,10 +47,9 @@ - - org.opendaylight.controller - sal - 0.4.0-SNAPSHOT - - + + org.opendaylight.controller + sal + + diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index ceeb29a1fc..8f9c4488ad 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/protocol_plugins/openflow/pom.xml @@ -70,12 +70,10 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT junit diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml index b7d7b05b60..d2f347c3da 100644 --- a/opendaylight/protocol_plugins/stub/pom.xml +++ b/opendaylight/protocol_plugins/stub/pom.xml @@ -57,7 +57,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index aa3f625939..b4a4170a90 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/routing/dijkstra_implementation/pom.xml @@ -59,7 +59,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller @@ -68,7 +67,6 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index 405f924554..b918720a44 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -66,7 +66,6 @@ org.osgi org.osgi.core - provided org.slf4j diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml index 006334edfe..64c477171d 100644 --- a/opendaylight/sal/connection/api/pom.xml +++ b/opendaylight/sal/connection/api/pom.xml @@ -50,7 +50,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/sal/connection/implementation/pom.xml b/opendaylight/sal/connection/implementation/pom.xml index 4a7e70b836..fd8d5ec5c9 100644 --- a/opendaylight/sal/connection/implementation/pom.xml +++ b/opendaylight/sal/connection/implementation/pom.xml @@ -58,12 +58,10 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT diff --git a/opendaylight/sal/networkconfiguration/api/pom.xml b/opendaylight/sal/networkconfiguration/api/pom.xml index 3c08b439ae..3add82b1b5 100644 --- a/opendaylight/sal/networkconfiguration/api/pom.xml +++ b/opendaylight/sal/networkconfiguration/api/pom.xml @@ -47,7 +47,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/sal/networkconfiguration/implementation/pom.xml b/opendaylight/sal/networkconfiguration/implementation/pom.xml index c25ce0fa4f..e157047f19 100644 --- a/opendaylight/sal/networkconfiguration/implementation/pom.xml +++ b/opendaylight/sal/networkconfiguration/implementation/pom.xml @@ -50,12 +50,10 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.networkconfiguration - 0.0.2-SNAPSHOT diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index 6f951ca2f6..f2cfbbc758 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -76,7 +76,6 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -85,17 +84,14 @@ org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index 3b054b6339..024035663c 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -75,32 +75,26 @@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller samples.loadbalancer - ${samples.loadbalancer} org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT org.codehaus.enunciate enunciate-core-annotations - ${enunciate.version} diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml index a4bb76d5ab..4492cad88a 100644 --- a/opendaylight/samples/simpleforwarding/pom.xml +++ b/opendaylight/samples/simpleforwarding/pom.xml @@ -63,17 +63,14 @@ org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller hosttracker - 0.5.1-SNAPSHOT org.opendaylight.controller @@ -86,7 +83,6 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml index ef45e76833..41f3149a20 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/security/pom.xml @@ -53,12 +53,10 @@ org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT orbit diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml index 3a1367901b..b1603d712b 100644 --- a/opendaylight/statisticsmanager/api/pom.xml +++ b/opendaylight/statisticsmanager/api/pom.xml @@ -47,22 +47,18 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml index c69e752549..bc7d458c46 100644 --- a/opendaylight/statisticsmanager/implementation/pom.xml +++ b/opendaylight/statisticsmanager/implementation/pom.xml @@ -95,32 +95,26 @@ org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT junit diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml index 026811f75b..a1bd6aa300 100644 --- a/opendaylight/statisticsmanager/integrationtest/pom.xml +++ b/opendaylight/statisticsmanager/integrationtest/pom.xml @@ -20,103 +20,83 @@ org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT org.opendaylight.controller statisticsmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller connectionmanager.implementation - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT org.opendaylight.controller sal.connection.implementation - 0.1.1-SNAPSHOT junit diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml index a4e96dd6a0..010aaa5d41 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/switchmanager/api/pom.xml @@ -92,17 +92,14 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml index 93c076dcba..01a73af18c 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/switchmanager/implementation/pom.xml @@ -97,27 +97,22 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT junit diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java index b5d0a48c28..4b186fc4a1 100644 --- a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java +++ b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java @@ -175,16 +175,11 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa retrieveCaches(); /* - * Read startup and build database if we have not already gotten the - * configurations synced from another node + * Read startup and build database if we are the coordinator */ - if (subnetsConfigList.isEmpty()) { + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { loadSubnetConfiguration(); - } - if (spanConfigList.isEmpty()) { loadSpanConfiguration(); - } - if (nodeConfigList.isEmpty()) { loadSwitchConfiguration(); } diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml index 24788771bf..2fa9c26a90 100644 --- a/opendaylight/switchmanager/integrationtest/pom.xml +++ b/opendaylight/switchmanager/integrationtest/pom.xml @@ -21,57 +21,46 @@ org.opendaylight.controller switchmanager - 0.7.0-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT junit diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml index 10b1a7243b..98b686c7ba 100644 --- a/opendaylight/topologymanager/implementation/pom.xml +++ b/opendaylight/topologymanager/implementation/pom.xml @@ -61,17 +61,14 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java index bb650132c6..45a8a5880b 100644 --- a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java +++ b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/TopologyManagerImpl.java @@ -195,7 +195,9 @@ public class TopologyManagerImpl implements userLinksFileName = ROOT + "userTopology_" + containerName + ".conf"; registerWithOSGIConsole(); - loadConfiguration(); + if ((clusterContainerService != null) && (clusterContainerService.amICoordinator())) { + loadConfiguration(); + } // Restore the shuttingDown status on init of the component shuttingDown = false; notifyThread = new Thread(new TopologyNotify(notifyQ)); diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/topologymanager/integrationtest/pom.xml index 93e8dcc89f..83050ead39 100644 --- a/opendaylight/topologymanager/integrationtest/pom.xml +++ b/opendaylight/topologymanager/integrationtest/pom.xml @@ -21,88 +21,71 @@ org.ops4j.pax.exam pax-exam-container-native - ${exam.version} test org.opendaylight.controller protocol_plugins.stub - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.1-SNAPSHOT org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT org.opendaylight.controller statisticsmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller switchmanager - - + org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller configuration.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml index f7064a3c6d..3b518cc5bc 100644 --- a/opendaylight/usermanager/api/pom.xml +++ b/opendaylight/usermanager/api/pom.xml @@ -52,14 +52,8 @@ org.opendaylight.controller.usermanager, - - ${project.basedir}/META-INF @@ -71,22 +65,18 @@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT junit diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml index dbf71fec68..84ca46a21b 100644 --- a/opendaylight/usermanager/implementation/pom.xml +++ b/opendaylight/usermanager/implementation/pom.xml @@ -69,27 +69,22 @@ org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.springframework.security diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java index 670124a1fa..5d0cbb6286 100644 --- a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java +++ b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/UserManager.java @@ -36,12 +36,12 @@ import org.opendaylight.controller.containermanager.IContainerAuthorization; import org.opendaylight.controller.sal.authorization.AuthResultEnum; import org.opendaylight.controller.sal.authorization.IResourceAuthorization; import org.opendaylight.controller.sal.authorization.UserLevel; -import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.controller.sal.utils.GlobalConstants; import org.opendaylight.controller.sal.utils.IObjectReader; import org.opendaylight.controller.sal.utils.ObjectReader; import org.opendaylight.controller.sal.utils.ObjectWriter; import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.controller.usermanager.AuthResponse; import org.opendaylight.controller.usermanager.AuthenticatedUser; import org.opendaylight.controller.usermanager.AuthorizationConfig; @@ -52,7 +52,6 @@ import org.opendaylight.controller.usermanager.ServerConfig; import org.opendaylight.controller.usermanager.UserConfig; import org.opendaylight.controller.usermanager.security.SessionManager; import org.opendaylight.controller.usermanager.security.UserSecurityContextRepository; - import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.slf4j.Logger; @@ -202,18 +201,12 @@ public class UserManager implements IUserManager, IObjectReader, private void loadConfigurations() { // To encode and decode user and server configuration objects loadSecurityKeys(); - /* - * Do not load local startup file if we already got the configurations - * synced from another cluster node + * Do not load local startup file if we are not the coordinator */ - if (localUserConfigList.isEmpty()) { + if ((clusterGlobalService != null) && (clusterGlobalService.amICoordinator())) { loadUserConfig(); - } - if (remoteServerConfigList.isEmpty()) { loadServerConfig(); - } - if (authorizationConfList.isEmpty()) { loadAuthConfig(); } } diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index 82abfbadb0..b0aef90699 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -93,17 +93,14 @@ org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller @@ -112,19 +109,15 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller web - 0.4.1-SNAPSHOT org.opendaylight.controller forwarding.staticrouting - ${forwarding.staticrouting} - com.fasterxml.jackson.core jackson-databind diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml index 5812c0e861..ed31de81ef 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/web/flows/pom.xml @@ -91,17 +91,14 @@ org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -110,12 +107,10 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller web - 0.4.1-SNAPSHOT diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 1a801a2fe4..beee1df9d2 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -97,32 +97,26 @@ org.opendaylight.controller clustering.services - 0.5.0-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index 358ea21ad9..6fc98d9f06 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -95,12 +95,10 @@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller configuration - 0.4.1-SNAPSHOT org.opendaylight.controller @@ -109,17 +107,14 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT org.opendaylight.controller web - 0.4.1-SNAPSHOT org.opendaylight.controller.thirdparty diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index 033cc6d9e9..69a8b9983e 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -93,12 +93,10 @@ org.opendaylight.controller forwardingrulesmanager - 0.5.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller @@ -107,19 +105,15 @@ org.opendaylight.controller sal - 0.7.0-SNAPSHOT org.opendaylight.controller statisticsmanager - 0.5.0-SNAPSHOT org.opendaylight.controller web - 0.4.1-SNAPSHOT - com.fasterxml.jackson.core jackson-databind