Tony Tkacik [Tue, 15 Apr 2014 10:43:10 +0000 (10:43 +0000)]
Merge "Resolve Bug:717 - Remove fragment version requirement from config-persister-*"
Tony Tkacik [Tue, 15 Apr 2014 10:40:30 +0000 (10:40 +0000)]
Merge "Bug 714 - Fixed creating DOM Document's element with namespace"
Tony Tkacik [Tue, 15 Apr 2014 10:26:02 +0000 (10:26 +0000)]
Merge "Resolve Bug:445 Remove freemarker from config code generator."
Tony Tkacik [Tue, 15 Apr 2014 10:25:03 +0000 (10:25 +0000)]
Merge "BUG 718: changed codec for URI parsing"
Tony Tkacik [Tue, 15 Apr 2014 10:09:26 +0000 (10:09 +0000)]
Merge "Resolve Bug:713 - Open snapshot only once per session."
Tony Tkacik [Tue, 15 Apr 2014 08:49:27 +0000 (08:49 +0000)]
Merge "Resolve Bug:707 - ConfigPusher should wait for netconf-impl to register JMX bean."
Tomas Olvecky [Mon, 14 Apr 2014 08:22:26 +0000 (10:22 +0200)]
Resolve Bug:713 - Open snapshot only once per session.
Rework NetconfOperationServiceSnapshot lifecycle: Open it when
session negotiator is requested, thus at entry point where both
hello message and session listener is created. Close the snapshot
when NetconfSessionListener receives down/terminated event.
Change-Id: Id491110524ab635e552a49f48e4938dd7113d8bf
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tomas Olvecky [Thu, 10 Apr 2014 12:13:14 +0000 (14:13 +0200)]
Resolve Bug:707 - ConfigPusher should wait for netconf-impl to register JMX bean.
Fixes race condition that was observed in ITs, where config pusher started pushing
empty configuration and immediately registered itself as notification listener of
a JMX bean that was not yet present. Fix waits both for netconf-impl and
config-netconf-connector services so that both dependencies are activated before
pushing of configuration can occur.
Change-Id: Id328dc3bd7e41bad59bb84b03461d89f5faeeea4
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Raghurama Bhat [Tue, 8 Apr 2014 20:48:25 +0000 (13:48 -0700)]
Bug 591: Minimize the use of Xtend in sal-binding-broker-impl
Change-Id: I3b21ccdf42685c7b10bf66fadf99ae82692149cf
Signed-off-by: Raghurama Bhat <ragbhat@cisco.com>
Tony Tkacik [Tue, 15 Apr 2014 07:46:03 +0000 (07:46 +0000)]
Merge "Cleanup utility classes"
Tony Tkacik [Tue, 15 Apr 2014 07:45:31 +0000 (07:45 +0000)]
Merge "BUG-459 Remove deprecated NetconfClient class."
Tony Tkacik [Tue, 15 Apr 2014 07:45:11 +0000 (07:45 +0000)]
Merge "BUG-372: Rework sal-netconf-connector"
Tony Tkacik [Tue, 15 Apr 2014 07:43:39 +0000 (07:43 +0000)]
Merge "Change RpcImplementation contract to asynchronous"
Tony Tkacik [Tue, 15 Apr 2014 07:28:02 +0000 (07:28 +0000)]
Merge "BUG702: RPC Router fails to acquire IP address of the host"
Robert Varga [Mon, 14 Apr 2014 16:13:00 +0000 (18:13 +0200)]
BUG-509: improve normalization error reporting
This patch introduces an explicit checked exception for reporting
normalization errors, declares it at strategic places and makes use of
it for generating better error reports than:
Caused by: java.lang.IllegalArgumentException: Supplied QName (urn:opendaylight:params:xml:ns:yang:pcep:crabbe:initiated:00?revision=2014-01-13)initiation is not valid according to schema container stateful
Change-Id: I2020c9e6ef85035259558a32f141a132b6321e0e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Mon, 14 Apr 2014 13:12:45 +0000 (15:12 +0200)]
BUG-509: Fail forwarning write if read fails.
This primarily gets rid of e.printStackTrace(), but as part of that it
defines an important thing: if a read fails while we're building up the
path, we should not try to continue with the operation.
Change-Id: I48cb6cd304a98684a6984d26b6fc8dd5d14963c5
Signed-off-by: Robert Varga <rovarga@cisco.com>
Maros Marsalek [Mon, 3 Mar 2014 12:35:48 +0000 (13:35 +0100)]
BUG-459 Remove deprecated NetconfClient class.
NetconfClient moved to test sources, now will be used only by tests.
Change-Id: Ia98abe3f6fa4f05566b71d57c519c2149726bcb6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
jameshall03885 [Wed, 9 Apr 2014 14:30:03 +0000 (10:30 -0400)]
Bug 651 - Added back IDE profile and changed target for yang sources
- The IDE maven profile was added back based on feedback from Giovanni Meo
- To avoid devs from having to run the IDE profile so eclipse can see the yang
generated source files, the yang source files are now generated under src/main/yang-gen-sals
or src/main/yang-gen-config instead of target/target-ide.
- The maven-clean-plugin was moved to the commons base pom and removed from
all child poms where it was specified. Thus, it will be automatically run for all
projects. The plugin's execution will clean all xtend and yang generated source dirs.
- The build-helper-maven-plugin was also moved to the commons base pom and removed from
all child poms. It will automatically run for all projects and no longer needs to be
specified in child poms. The plugin's execution will created eclipse source folders
for all xtend and yang generated source.
Tom P and Devin A really did all this work, Greg just gets credit unfairly.
Conflicts:
opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml
Change-Id: I8d9e403629cab2e48d03d5c7a417a02f1d878ca7
Signed-off-by: tpantelis <tpanteli@brocade.com>
Signed-off-by: jameshall03885 <ghall@brocade.com>
Signed-off-by: dbavery <devin.avery@brocade.com>
Signed-off-by: jameshall03885 <ghall@brocade.com>
Milos Fabian [Mon, 14 Apr 2014 08:05:15 +0000 (10:05 +0200)]
Bug 714 - Fixed creating DOM Document's element with namespace
Change-Id: Ic7449e11a9b2057d350dc889fcb81872d9ce24f8
Signed-off-by: Milos Fabian <milfabia@cisco.com>
Robert Varga [Thu, 27 Feb 2014 16:26:21 +0000 (17:26 +0100)]
Cleanup utility classes
Do not allow them to be instantiated, add a few comments and eliminate
e.printStackTrace();
Change-Id: I2e84bd81f2b91431791305fb61ca597337e98ae8
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 11 Feb 2014 07:44:46 +0000 (08:44 +0100)]
BUG-372: Rework sal-netconf-connector
This makes the connector truly asynchronous and able to work with
backing datastore going away. It will retry connecting infintely to the
backed device, too.
Change-Id: I843620bf63eeade231698c22592aaec0521a09ad
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 27 Feb 2014 08:02:42 +0000 (09:02 +0100)]
Change RpcImplementation contract to asynchronous
This changes the method used to invoke RPCs such that they need not be
synchronous anymore, but rather return a ListenableFuture. If an
implementation is synchronous, it should use Futures.immediateFuture()
as a wrapper.
Change-Id: I0623d2afda038ba49afa83ed6020910b74b4911e
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 11 Apr 2014 16:21:26 +0000 (18:21 +0200)]
Fix run script always emitting a warning
This fixes a typo which resulted in the "memory not set" warning always
being omitted.
Change-Id: I7a9479adc6dde9be3d09e10d6e05e22004a876e6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Fri, 11 Apr 2014 14:49:47 +0000 (14:49 +0000)]
Merge "Remove unused code"
Tony Tkacik [Fri, 11 Apr 2014 14:45:56 +0000 (14:45 +0000)]
Merge "BUG-592: Fix InstanceIdentifier instantiation"
Alessandro Boch [Thu, 3 Apr 2014 06:22:47 +0000 (23:22 -0700)]
Add async addStaticFlow api to FRM
Change-Id: I6189ab2f617895a780bd14b9a620250476058da5
Signed-off-by: Alessandro Boch <aboch@cisco.com>
Giovanni Meo [Fri, 11 Apr 2014 13:19:12 +0000 (15:19 +0200)]
Remove unused code
- Cleanup some unused code from opendaylight/sal directory
Change-Id: I2a1197f9221c68bbd742584c1bd13ee3adf23af3
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Martin Sunal [Fri, 11 Apr 2014 10:54:51 +0000 (12:54 +0200)]
BUG 718: changed codec for URI parsing
Change-Id: Ida06cb8d662ada99d67b994049228c7844d9d41e
Signed-off-by: Martin Sunal <msunal@cisco.com>
Tomas Olvecky [Fri, 11 Apr 2014 09:24:19 +0000 (11:24 +0200)]
Resolve Bug:717 - Remove fragment version requirement from config-persister-*
Remove Fragment-Host version requirement, because it does not map well
with maven versioning.
Change-Id: Ibec7a858e97d86ddf2c1f296d5bb0d36be30ff86
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tony Tkacik [Fri, 11 Apr 2014 08:52:59 +0000 (08:52 +0000)]
Merge "BUG-509: improve memory efficiency of ListenerTree"
Tony Tkacik [Fri, 11 Apr 2014 08:52:42 +0000 (08:52 +0000)]
Merge "BUG-509: Encapsulate ListenerTree"
Robert Varga [Wed, 26 Mar 2014 23:54:48 +0000 (00:54 +0100)]
BUG-592: Fix InstanceIdentifier instantiation
This is a follow-up patch for
https://git.opendaylight.org/gerrit/#/c/5778 and gets rid of using
direct constructor use.
Change-Id: I09310b71c595a99bb09038f129b47b5b28aaaa33
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Pramila Singh [Fri, 11 Apr 2014 00:42:52 +0000 (17:42 -0700)]
readAllNodeTable() API in readServiceFilter.java queries for wrong OFStatisticsType
Change-Id: I5551970f89587cbc6adae931d65c164aad8b0ca1
Signed-off-by: Pramila Singh <pramisin@cisco.com>
Robert Varga [Thu, 10 Apr 2014 16:59:45 +0000 (18:59 +0200)]
BUG-509: improve memory efficiency of ListenerTree
As it turns out, we do not need a Set<>, but rather a collection. We do
not expect major modifications of listeners, but memory efficiency and
iteration speed are required. Thus turn the HashSet into an ArrayList.
Also rename DataChangeListenerRegistration to
DataChangeListenerRegistrationImpl, so that the interface itself can be
imported and used as a shortname. This has the nice effect of rendering
a nasty SuppressWarnings completely unneeded.
Change-Id: I100337651c3b42c715978708bc98cf24ce5bf703
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 10 Apr 2014 10:28:24 +0000 (12:28 +0200)]
BUG-509: Encapsulate ListenerTree
This patch encapsulates the ListenerTree. This provides the
infrastructure needed to make listener registration/unregistration scale
and work in face of asynchronous commits.
Whenever a listener is about to be registered, the tree is write-locked,
the apropriate structure is created and the registration is enqueued.
When a registration is closed, the removeListener() callback re-takes
the appropriate lock and removes the listener.
When the last listener is removed from a node, and that node is unused,
it is cascaded up to its parent for removal, which recursively does the
same. This means that the tree is of unused nodes as soon as they are
freed. The backreference to parent is kept weak, which makes sure we are
able to finalize as much as we can in case of funky references lying
around.
Write locks are never leaked outside of the ListenerTree class, e.g.
they are always released before we return to the caller.
When a transaction is being committed, the ListenerTree is asked for a
Walker, which is an AutoCloseable resource. A Walker is the only way how
foreign code can get hold of a listener tree root node. Each walker is
backed by a reference to a read-lock, e.g. listener
registration/unregistration cannot occur while such a lock is held. This
makes sure the commit process sees a point-in-time view of the listener
tree. When a Walker is closed, the tree lock is read-unlocked. The
close() method is idempotent.
Change-Id: I6ea9b2e00f8ab21a5d8bd3b8c82c193c2069d683
Signed-off-by: Robert Varga <rovarga@cisco.com>
Giovanni Meo [Thu, 10 Apr 2014 16:18:31 +0000 (16:18 +0000)]
Merge "Upgrading clustermanager to use infinispan 6.0.2Final."
Tony Tkacik [Thu, 10 Apr 2014 12:10:24 +0000 (12:10 +0000)]
Merge "BUG-694: Disable DataReader registration for BA Broker"
Robert Varga [Wed, 9 Apr 2014 16:23:19 +0000 (18:23 +0200)]
BUG-694: Disable DataReader registration for BA Broker
The DataReader's semantic contract with its users, data merge,
when working with Binding-Aware DTOs.
The existing DataReaders implementations need to be rewritten as
datastores, which deal with the same problem in Binding Independent
format, such as the BI Data Broker.
Change-Id: I91b4516bb04a570acb6bf2b381860e9ae3fbbd43
Signed-off-by: Robert Varga <rovarga@cisco.com>
Abhishek Kumar [Tue, 8 Apr 2014 22:58:15 +0000 (15:58 -0700)]
BUG702: RPC Router fails to acquire IP address of the host
Removed the check that only picked private address space addresses. Now we pick IPv4 address belonging in any category that is not loopback address.
Change-Id: Idf98d1c64306059029bc4a6347d1ff952d45a6ba
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
Andrew Kim [Wed, 9 Apr 2014 16:27:28 +0000 (16:27 +0000)]
Merge "Bug 664 Update security.xml in web bundle"
Giovanni Meo [Wed, 9 Apr 2014 15:11:28 +0000 (15:11 +0000)]
Merge "Document why we are using Virgo ExtensionsHookConfigurator"
Giovanni Meo [Wed, 9 Apr 2014 14:38:39 +0000 (14:38 +0000)]
Merge "Bug 698 - Confingured controller script to set max memory to 1 GB if not defined"
Robert Varga [Wed, 9 Apr 2014 14:26:39 +0000 (16:26 +0200)]
Document why we are using Virgo ExtensionsHookConfigurator
Change-Id: I289f091262c238985a83ea69df1b6b57fb29c2e1
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ravikumar Chiguruvada [Tue, 8 Apr 2014 10:34:56 +0000 (16:04 +0530)]
Upgrading clustermanager to use infinispan 6.0.2Final.
- Removed unnecessary BaseInterceptor clone which was needed for 5.3.0
version
- Bumped services_implementation implementation version to indicate
this is actually different.
- Modified the parent pom version so version propagate in other places
Signed-off-by: Ravikumar Chiguruvada <ravikumar.chiguruvada@ericsson.com>
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Change-Id: I062c72153a2ffe6949f3a3c8d2f0cdaa826bb65c
dbavery [Tue, 8 Apr 2014 18:45:14 +0000 (14:45 -0400)]
Bug 698 - Confingured controller script to set max memory to 1 GB if not defined
Modified the run.sh and run.bat scripts to configure the java max memory to be
1 GB if it is not defined on the command line.
NOTE: Java generally sets the memory to be 1/4th the total memory of your system
so it is possible that this will result in LESS memory being allocate (change of
behavior). Once this work item is committed we should encourage a best practice
of defining max memory.
A message will be printed out notifying the users that the max memory was not
specified.
Change-Id: I39225f28c4aed3636a1db0cdb41fbe802f5b5b54
Signed-off-by: dbavery <devin.avery@brocade.com>
Robert Varga [Wed, 9 Apr 2014 04:37:06 +0000 (06:37 +0200)]
BUG-509: improve safety of MutableDataTree
This limits field visibility and improves seal operation with respect to
other operations. Also make sure to check for multiple seals.
Change-Id: I2c91e59e3308010f8c95a3fb3898bace97b2db97
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 9 Apr 2014 04:20:17 +0000 (06:20 +0200)]
BUG-509: limit visibility of updateModificationType()
Limits updateModificationType() to private. Also add GuardedBy
annotations to explain that seal and this method require
synchronization.
Change-Id: Iff49e15c890bac38cb5ff19c347551dcee5bb4b8
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 9 Apr 2014 04:02:11 +0000 (06:02 +0200)]
BUG-509: explain the use of SuppressWarnings
This adds an explanation why we opted to suppress warnings instead of
doing the type-safe thing.
Also speeds up string building very slightly by compacting two append()
calls and using append(char) instead append(String).
Change-Id: Ifed1005bb118de101476063790b5c8aee73888bb
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 9 Apr 2014 03:48:36 +0000 (05:48 +0200)]
BUG-509: clean up comment
This cleans up a comment why subtracting 1 from nesting is safe. It also
adds a Preconditions.checkState() to explicitly guard on the
expectation.
Change-Id: Ia0b755d723d399b99fec98398afabba1222b97b3
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Wed, 9 Apr 2014 03:39:58 +0000 (05:39 +0200)]
BUG-509: Fix a constructor typo/thinko
The 'nested' array should be initialized as empty, but sized for
the size of path.getPath(), as we fill it continuously as we traverse
the tree.
The original initialization also copied path.getPath(), resulting in the
path reported in full and then correctly.
Change-Id: I9a918ced62a845b985459699e23f1f2f1d55cf35
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tomas Olvecky [Fri, 21 Feb 2014 09:53:44 +0000 (10:53 +0100)]
Resolve Bug:445 Remove freemarker from config code generator.
Change-Id: Idf834620cb7e12e10e7fca1ce8ea0172ca730a3d
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tony Tkacik [Wed, 9 Apr 2014 08:19:07 +0000 (08:19 +0000)]
Merge "BUG-704 Fix failing integration test in netconf-it"
Maros Marsalek [Wed, 9 Apr 2014 06:49:35 +0000 (08:49 +0200)]
BUG-704 Fix failing integration test in netconf-it
Ignore for now, proper fix will follow
Change-Id: Iee9bfc3bedf6daca7afd5d57ae37f758c1acd871
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Robert Varga [Wed, 9 Apr 2014 03:29:00 +0000 (05:29 +0200)]
BUG-509: Rename StoreMetadataNode.createRecursivelly
This is a rename of StoreMetadataNode.createRecursivelly() to
StoreMetadataNode.createRecursively(), fixing an obvious typo.
Change-Id: I3891459ebae561b89c27438f2e0f187bd7b7c503
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Tue, 8 Apr 2014 16:07:32 +0000 (18:07 +0200)]
BUG-509: Fix thread safety of listener registration
This commit fixes the race condition where a listener is registered
after preCommit() and before commit(). This is done by moving the
collection into the commit() where it is protected by the
commit/listener synchronized block.
The unregistration safety is handled by wrapping the returned
registration and invoking the equivalent synchronized block.
Change-Id: Ie9abc81b2a773418b34c3051f7665b0dcf047f76
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 27 Mar 2014 02:52:42 +0000 (03:52 +0100)]
BUG-509: Improve InMemoryDOMDataStore structure
Introduce AbstractDOMStoreTransaction, which holds common code. Also use
ToStringHelper to get consistent toString().
Change-Id: I246c891fa4a9a4c12b21eeb2743a00097dd95fbe
Signed-off-by: Robert Varga <rovarga@cisco.com>
Andrew Kim [Tue, 8 Apr 2014 22:44:58 +0000 (17:44 -0500)]
Bug 664 Update security.xml in web bundle
Update security.xml in web bundle to point to correct img directory
Change-Id: I4cd8dda2641bed3e284f3dc5039490e378042c66
Signed-off-by: Andrew Kim <andrekim@cisco.com>
Ed Warnicke [Tue, 8 Apr 2014 16:12:31 +0000 (16:12 +0000)]
Merge "Bug 509: Fixed order of invoking Schema listeners."
Tony Tkacik [Tue, 8 Apr 2014 16:11:43 +0000 (16:11 +0000)]
Merge "BUG-509: Fix thread safety of DOMDataBrokerImpl.ready()"
Tony Tkacik [Tue, 8 Apr 2014 16:11:26 +0000 (16:11 +0000)]
Merge "BUG-579: Remove ImmutableMap in favor of LinkedHashMap"
Ed Warnicke [Tue, 8 Apr 2014 16:11:16 +0000 (16:11 +0000)]
Merge "Fixed potential class pool override in integration tests."
Robert Varga [Thu, 27 Mar 2014 02:51:34 +0000 (03:51 +0100)]
BUG-509: Fix thread safety of DOMDataBrokerImpl.ready()
Transition to ready has to occur precisely once, so the process of
taking cohorts has to be synchronized.
Change-Id: I8ba8fe7437dd59547d04fec73f5cd9ed43232161
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Thu, 27 Mar 2014 03:55:56 +0000 (04:55 +0100)]
BUG-579: Remove ImmutableMap in favor of LinkedHashMap
This prevents a single round og ImmutableMapBuilder.build() as a
trade-off for not leaking a mutable reference to the map.
Change-Id: Idb97a5f4ece1d2f27af728310d9b0807ae305926
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tony Tkacik [Tue, 8 Apr 2014 11:58:16 +0000 (11:58 +0000)]
Merge "Update config-module-archetype."
Tony Tkacik [Tue, 8 Apr 2014 11:54:24 +0000 (11:54 +0000)]
Merge "Add filtering capability to config.ini in order to reference logging bridge version."
Tony Tkacik [Tue, 8 Apr 2014 11:53:15 +0000 (11:53 +0000)]
Merge "Resolve Bug:522"
Tony Tkacik [Tue, 8 Apr 2014 10:13:03 +0000 (10:13 +0000)]
Merge "BUG-633: allow bootstrap customization"
Tony Tkacik [Tue, 8 Apr 2014 09:59:15 +0000 (09:59 +0000)]
Merge "Resolve Bug:623 : Generate private key using bouncycastle."
Tony Tkacik [Tue, 8 Apr 2014 09:55:33 +0000 (09:55 +0000)]
Merge "Bug 639, Bug 641, Bug 642: This is MD-SAL based sample implementation of a learning switch with optimizations in how packet is forwarded. Link to detail documetation: https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:L2_Switch"
Tony Tkacik [Tue, 8 Apr 2014 09:44:35 +0000 (09:44 +0000)]
Merge "524 bug - %2F slashes translation behind mount point (unit test)"
Tony Tkacik [Tue, 8 Apr 2014 09:39:35 +0000 (09:39 +0000)]
Merge "BUG-672 Make Xml directory adapter skip initial config files with invalid xml."
Tony Tkacik [Tue, 8 Apr 2014 09:39:15 +0000 (09:39 +0000)]
Merge changes I6029bd48,Ie8eb4152
* changes:
BUG-672 Add includeExtensions property to Xml directory persister adapter.
BUG-672 Remove deprecated plaintext/autodetect persister adapters.
Tony Tkacik [Tue, 8 Apr 2014 09:38:45 +0000 (09:38 +0000)]
Merge "bug - missing excaping of % character in String.format() method"
Madhu Venugopal [Mon, 7 Apr 2014 22:38:36 +0000 (22:38 +0000)]
Merge "Fix bug 666 - Neutron Subnet Creation Error"
Tony Tkacik [Mon, 7 Apr 2014 15:34:04 +0000 (17:34 +0200)]
Fixed potential class pool override in integration tests.
Classloader in JUnit test is shared resource and in order
to integrate well with Javassist we are required to share
also classpool in order to compile generated code
using previously existing generated code in same Classloader.
If we introduce new ClassPool for same classloader,
compilation may fail, because new ClassPool is unable
to fetch bytecode for already generated classes.
Change-Id: Idd933670fe0a1c06d40aeed182f46997a843ab91
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Maros Marsalek [Mon, 7 Apr 2014 15:28:36 +0000 (17:28 +0200)]
BUG-672 Make Xml directory adapter skip initial config files with invalid xml.
Issue a warning and continue to next file.
Change-Id: I1950eddc80b958f5887458ebeaa53b590506c31c
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Mon, 7 Apr 2014 12:48:15 +0000 (14:48 +0200)]
BUG-672 Add includeExtensions property to Xml directory persister adapter.
This property allows to filter initial config files by extension.
Property supports multiple extensions separated by ','.
This property is optional, and if not present, all files are picked up regardless of their extension.
Change-Id: I6029bd48fa3b576006a4409d8f19e0c4956de036
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Maros Marsalek [Mon, 7 Apr 2014 11:04:39 +0000 (13:04 +0200)]
BUG-672 Remove deprecated plaintext/autodetect persister adapters.
Xml adapters are the default adapters now for configuration persister.
Change-Id: Ie8eb41520671bb00503a340f6b4b55ebe1ef7bf1
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Tony Tkacik [Mon, 7 Apr 2014 10:31:55 +0000 (12:31 +0200)]
Bug 509: Fixed order of invoking Schema listeners.
Explicitly registered SchemaServiceListeners
are invoked before listeners picked-up by whiteboard
pattern, which by default are not aware
of the service.
Change-Id: Id41b89a1ba2ccb5323d5ab5ad8a95d2048776679
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tomas Olvecky [Mon, 7 Apr 2014 07:44:31 +0000 (09:44 +0200)]
Resolve Bug:623 : Generate private key using bouncycastle.
Add dependency on bouncycastle and use it to generate private key in PEM
format when key file is not present on the filesystem.
Change-Id: I07290e0f361151743a50559c26255eab23cababb
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Tony Tkacik [Mon, 7 Apr 2014 09:04:13 +0000 (09:04 +0000)]
Merge "BUG-509: make sure datastore commits are visible"
Giovanni Meo [Mon, 7 Apr 2014 08:06:17 +0000 (08:06 +0000)]
Merge "Edges are left in TopologyManager database when nodes disconnect"
Jozef Gloncak [Mon, 7 Apr 2014 06:27:19 +0000 (08:27 +0200)]
bug - missing excaping of % character in String.format() method
Change-Id: Ic44ff0cf558efbba9c465ac760da13fcf3add2cb
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Dave Tucker [Sun, 6 Apr 2014 16:48:33 +0000 (17:48 +0100)]
Fix bug 666 - Neutron Subnet Creation Error
When a neutron subnet is created on the Northbound API, containing the
new "ipv6_address_mode" or "ipv6_ra_mode" fields with "null" values
Jersey will fail to deserialise the object correctly and throw an HTTP
500 error with a NullPointerException.
This commit adds the above fields to the NeutronSubnet object and
permits these fields to be nillable.
Change-Id: I225581b57a1698a5e5c17f91b117fba556b70976
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
Robert Varga [Fri, 4 Apr 2014 17:14:57 +0000 (19:14 +0200)]
BUG-509: internal cleanup
Spell-check internal class and make it static
Make sure we don't have null name in contructor
Make sure we don't have null executor in constructor
getIdentifier() should be final
Change-Id: Ib8ebe82106d953581738bccbe1d4b878f9520b5b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 4 Apr 2014 17:50:57 +0000 (19:50 +0200)]
BUG-509: make sure datastore commits are visible
This wraps the datastore root in an AtomicReference, which makes sure
started transactions see the latest published commit. This will make
the datastore handling more robust under tight conditions.
Also uncovers the fact that we are invoking user code under lock, which
we fix by reusing the executor used by the commit machinery.
Finally it uncovers thread-unsafe listener list manipuation. This will
need to be addressed in a follow-up patch.
Change-Id: Ic7efd266ef680701c1f0944ee675122d8527568b
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Sun, 6 Apr 2014 16:20:58 +0000 (18:20 +0200)]
BUG-633: allow bootstrap customization
Downstream projects may need to customize Bootstrap/ServerBootstrap
instances before they are used. Create two protected methods which
can be overridden to gain access to the instances before they are used.
Change-Id: Ibb45c7b99847cbe2fe8b90e8d1bf125c66a18e0d
Signed-off-by: Robert Varga <rovarga@cisco.com>
Maurice Qureshi [Sat, 5 Apr 2014 03:17:22 +0000 (20:17 -0700)]
Edges are left in TopologyManager database when nodes disconnect
When nodes are disconnected from ODL Controller, some edges are left
in TopologyManager's database. As a result GUI (and possibly REST APIs0
still shows some switches to be connected even when there are no
switches connected to the controller.
Change-Id: Ia4a5ae0160b07ba0207bf763dbc234e34dcf5816
Signed-off-by: Maurice Qureshi <maquresh@cisco.com>
Amit Mandke [Sat, 5 Apr 2014 00:59:52 +0000 (17:59 -0700)]
Bug 639, Bug 641, Bug 642: This is MD-SAL based sample implementation of a learning switch with optimizations in how packet is forwarded.
Link to detail documetation: https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:L2_Switch
It has following components:
PacketHandler examines Ethernet packets to find information about Mac-Port pairings.
-informs AddressTracker about new Mac-Port pairings.
-informs FlowWriterService about new flows, when the source & destination of a packet are known.
-uses InventoryService to determine external ports and only send packets to those ports when flooding packets in the network.
AddressTracker stores the Mac-Port pairings in the MD-SAL data tree.
InventoryService provides information about the nodes and node connectors in the network.
FlowWriterService adds packet forwarding (mac-to-mac) flows to the MD-SAL data tree.
-uses NetworkGraphDijkstra to determine all the intermediate nodes along a path.
TopologyLinkDataChangeHandler listens to topology updates and informs NetworkGraphDijkstra of these updates.
NetworkGraphDijkstra maintains the network graph and computes the shortest path between each node.
Change-Id: I33497a9e2136316de1db16e1c7f916cbc13f437f
Signed-off-by: Amit Mandke <ammandke@cisco.com>
Robert Varga [Fri, 4 Apr 2014 13:25:41 +0000 (15:25 +0200)]
Bug 510: Updated initial configuration to easily enable new datastore
In order to enable new in-memory datastore (and to wire it with clients)
initial configuration of md-sal (01-md-sal.xml) needs to be updated
to unwire old services and wire new one to the actual MD-SAL brokers.
This could be done by commenting out all DATA-BROKER sections
and uncommenting NEW-DATA-BROKER sections.
Change-Id: I072a65785593b82ec4b1ff6e3dae4c0af7497659
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Martin Sunal <msunal@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ed Warnicke [Fri, 4 Apr 2014 17:05:09 +0000 (17:05 +0000)]
Merge "Bug 510: Implementation of Forwarded Binding Data Broker"
Ed Warnicke [Fri, 4 Apr 2014 16:41:22 +0000 (16:41 +0000)]
Merge "Resolve Bug:654 - Fix config-persister exception handling."
Robert Varga [Fri, 28 Mar 2014 21:23:07 +0000 (22:23 +0100)]
Bug 510: Implementation of Forwarded Binding Data Broker
Initial implementation of Forwarded Binding Data Broker
and Forwarded Backwards Compatible Data Broker,
which provides access to new data broker via original
API.
Added sample configuration which enables new
DOM Data Broker, In-memory Data Broker and
ForwardedCompatibleDataBroker.
Change-Id: I3569da20a9873edf352a54622be7a01fd329aa9b
Signed-off-by: Moiz Raja <moraja@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Tomas Olvecky [Fri, 4 Apr 2014 10:29:19 +0000 (12:29 +0200)]
Resolve Bug:654 - Fix config-persister exception handling.
Modify NetconfUtil to fail on any <rpc-error>, not detecting transaction conflicts. Move
exception handling to ConfigPusher.
Also fix bug when config-netconf-connector detects discrepancy between yang store and
config manager factories: persister will retry as if some capabilities were not found.
Change-Id: Ibd80fd3859031ae41301481dad9b50f74207e64c
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
Robert Varga [Wed, 26 Mar 2014 18:29:13 +0000 (19:29 +0100)]
Bug 499: Fixed normalization of InstanceIdentifier for backwards compatibility
Change-Id: I633eb004729c6013df49c3f82420adf6d2417ea9
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Robert Varga [Fri, 21 Mar 2014 12:30:45 +0000 (13:30 +0100)]
Bug 499: Improved data change listener tree management
Change-Id: I62843c3c4df32dd5a5849511d41352fa6822550b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
Michal Rehak [Fri, 4 Apr 2014 10:44:38 +0000 (12:44 +0200)]
fix for BUG 663 - causing derived IT to fail
- added version to netty-config-api test dependency
Change-Id: I6653522e447283f28d5d89884427473973eb508b
Signed-off-by: Michal Rehak <mirehak@cisco.com>
Andrew Kim [Thu, 3 Apr 2014 22:42:35 +0000 (17:42 -0500)]
Add Flood and FloodAll supported actions
This patch will return Flood and FloodAll as supported actions when a switch is queried for its supported flow actions
Change-Id: I8c4b8821bd773e3eb654f35a60a9f41e08deadb6
Signed-off-by: Andrew Kim <andrekim@cisco.com>
Ed Warnicke [Wed, 2 Apr 2014 23:28:41 +0000 (23:28 +0000)]
Merge changes I6bc37e88,I0514b26e
* changes:
Fixed missing keys in sal-compatibility flows.
Bug 508: Fixed concurrent conflicting commits by InventoryManager.
Michael Bredel [Wed, 2 Apr 2014 09:26:59 +0000 (11:26 +0200)]
Added a comment that briefly describes the ArpHander service and explains some design decisions.
Change-Id: I2dd3877e5a12ad59f4c5057de09ecab2b4e9f768
Signed-off-by: Michael Bredel <michael.bredel@cern.ch>