controller.git
9 years agoBUG-1051: logback configuration loader proposal 52/7252/3
Michal Rehak [Tue, 20 May 2014 15:57:18 +0000 (17:57 +0200)]
BUG-1051: logback configuration loader proposal

- uses environment variable logback.config.d (pointing to config root folder)
- removes previously loaded logging configuration
- applies all config files from config root folder in alphabetical order
- requires:
  - to be added to osgi.bundles (configuration.ini)
  - existing logback.config.d variable (configuration.ini)
  - logback config files in specified config root folder
- added overloads for load method
- enriched util class protection against "accidental" instantiation
- using precompiled pattern while iterating folder content
- added classcast protection for case when the logging backend differs from logback

Change-Id: Id0242c78fe39b9631d1a4bca66d9674f7a3fec62
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoBug 981: Converted test to use BitsType.create() 38/7538/1
Tony Tkacik [Fri, 30 May 2014 14:39:36 +0000 (16:39 +0200)]
Bug 981: Converted test to use BitsType.create()

Change-Id: I759c55c48de64e48c5757aba5b7665f2478aa0fb
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Bug 1003: Restconf - remove whitespace on input"
Tony Tkacik [Fri, 30 May 2014 12:33:04 +0000 (12:33 +0000)]
Merge "Bug 1003: Restconf - remove whitespace on input"

9 years agoMerge "Bug 1073: Introduced Transaction Chain to DOMStore APIs."
Ed Warnicke [Fri, 30 May 2014 12:25:16 +0000 (12:25 +0000)]
Merge "Bug 1073: Introduced Transaction Chain to DOMStore APIs."

9 years agoBUG-509: cleanup datastore interafaces 16/7516/2
Robert Varga [Thu, 29 May 2014 13:04:30 +0000 (15:04 +0200)]
BUG-509: cleanup datastore interafaces

This removes unused methods and adds interface contract documentation.

Change-Id: I7bc57d034da1d0503d76afa6f4c09ce6a6bfe669
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: remove unnecessary Version objects 15/7515/2
Robert Varga [Wed, 28 May 2014 22:02:17 +0000 (00:02 +0200)]
BUG-509: remove unnecessary Version objects

Testing has revealed the datastore instantiates effectively a version
per tree node. This turns out to be not needed, as we really just need a
single version per commit -- which can be shared between nodes, as the
(node,version) tuple remains unique.

So let's just instantiate a single version when we start the
transaction, which we need to do anyway, and use it for all
nodes/subtrees added or modified. This places an upper bound on Version
objects retained to the number of transactions committed (not counting
no-ops).

Change-Id: I40d095ec230eee8b5af2409c1e8ee61a1860a9d3
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: use concurrent hash-trie Map 63/7363/5
Robert Varga [Fri, 23 May 2014 11:11:39 +0000 (13:11 +0200)]
BUG-509: use concurrent hash-trie Map

This patch switches to using concurrent hash-trie map for metadata
tracking. It has the nice feature of having O(1) concurrent snapshots,
which should give us better performance when dealing with large children
bases.

This is a trade-off, please refer to yangtools.util.MapAdaptor for
system properties which tune its behavior.

Change-Id: I2ddb81a1296cc17528a605eeaeda1f303560fb55
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-648: include yangtools.util package"
Tony Tkacik [Thu, 29 May 2014 10:37:59 +0000 (10:37 +0000)]
Merge "BUG-648: include yangtools.util package"

9 years agoBug 625 - Fixed Apache DM Activation after removing xtend code. 85/7485/1
Vaclav Demcak [Thu, 29 May 2014 09:44:19 +0000 (11:44 +0200)]
Bug 625 - Fixed Apache DM Activation after removing xtend code.

Apache DM does not provide any compile time/ runtime checks
for callbacks missing / modified.
Previously in xtend callbacks were provided by @Property
annotation, which generated setters and getters for this.

In refactor these was accidentally ommited. From code-perspective
it was not obvious that this affects Apache DM instantiation of
this service, since Apache DM uses strings and reflection.

Change-Id: I655ce7c1bc9971e3db370c5048057c1e6070a46d
Signed-off-by: Vaclav Demcak <vdemcak@cisco.com>
9 years agoBUG-648: include yangtools.util package 65/7465/3
Robert Varga [Wed, 28 May 2014 17:02:01 +0000 (19:02 +0200)]
BUG-648: include yangtools.util package

This include yangtools.util, which will hold various utility classes.
First of which is MapAdaptor, needed to solve the 'copying hashmaps'
problem.

Change-Id: Ifdb7709e1b83d07d1e96832954987072f82274ae
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: migrate MDFlowMapping 63/7463/1
Robert Varga [Wed, 28 May 2014 12:57:06 +0000 (14:57 +0200)]
BUG-625: migrate MDFlowMapping

This patch migrates MDFlowMapping from xtend to pure Java, optimizing it
at the same time.

Change-Id: Ibc92760b2d250b190ca9aa25c818b9cc40ad39b2
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Bug 1029: Remove dead code: sal-dom-it"
Tony Tkacik [Wed, 28 May 2014 14:40:59 +0000 (14:40 +0000)]
Merge "Bug 1029: Remove dead code: sal-dom-it"

9 years agoMerge "Bug 1029: Remove dead code: sal-schema-repository-api"
Tony Tkacik [Wed, 28 May 2014 14:40:46 +0000 (14:40 +0000)]
Merge "Bug 1029: Remove dead code: sal-schema-repository-api"

9 years agoBUG-625: migrate FlowProgrammerAdapter 62/7462/1
Robert Varga [Wed, 28 May 2014 09:59:53 +0000 (11:59 +0200)]
BUG-625: migrate FlowProgrammerAdapter

This migrates FlowProgrammerAdapter from xtend to pure Java, cleaning it
up in the process. A bunch of possible omissions/errors are marked with
FIXME for someone to follow up.

Change-Id: I057449bd7a569a75e30182493727dbc200f83e62
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: migrate ComponentActivator 61/7461/1
Robert Varga [Wed, 28 May 2014 08:19:31 +0000 (10:19 +0200)]
BUG-625: migrate ComponentActivator

This migrates ComponentActivator from xtend to pure Java, simplifying
and clarifying it bit.

Change-Id: If293cd0c99d931a5a16500b2e72c9afd631ccc02
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge changes I1ba91f59,I6d69f9da,I99ddffb1,I6fdc9d42
Tony Tkacik [Wed, 28 May 2014 08:37:44 +0000 (08:37 +0000)]
Merge changes I1ba91f59,I6d69f9da,I99ddffb1,I6fdc9d42

* changes:
  BUG-625: convert TopologyProvider
  BUG-625: convert TopologyMapping
  BUG-625: convert TopologyAdapter
  BUG-625: split off SalCompatibilityProvider

9 years agoMerge "BUG-625: convert DataPacketAdapter"
Tony Tkacik [Wed, 28 May 2014 08:36:58 +0000 (08:36 +0000)]
Merge "BUG-625: convert DataPacketAdapter"

9 years agoMerge "BUG-614: convert RuntimeCodeSpecification"
Tony Tkacik [Wed, 28 May 2014 08:29:56 +0000 (08:29 +0000)]
Merge "BUG-614: convert RuntimeCodeSpecification"

9 years agoBUG-614: convert RuntimeCodeSpecification 56/7456/1
Robert Varga [Wed, 28 May 2014 07:14:33 +0000 (09:14 +0200)]
BUG-614: convert RuntimeCodeSpecification

This migrates RuntimeCodeSpecification from xtend to Java, increasing
its efficiency.

Change-Id: I00b3ab7f3a47e0d3fc71e55b4bec99364bfa8e5f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: convert TopologyProvider 39/7439/1
Robert Varga [Tue, 27 May 2014 20:48:56 +0000 (22:48 +0200)]
BUG-625: convert TopologyProvider

This patch converts TopologyProvider from being xtend class to being a
pure Java class.

Change-Id: I1ba91f5988243259d39c812a0ffdda7b3d7d608e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: convert TopologyMapping 38/7438/1
Robert Varga [Tue, 27 May 2014 20:34:19 +0000 (22:34 +0200)]
BUG-625: convert TopologyMapping

This converts TopologyMapping from xtend to Java.

Change-Id: I6d69f9da2bbd47d8a7c8bd7104f4c2214ab6ed57
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: convert TopologyAdapter 37/7437/1
Robert Varga [Tue, 27 May 2014 19:38:31 +0000 (21:38 +0200)]
BUG-625: convert TopologyAdapter

This patch converts the TopologyAdaptoer from being an xtend class to
being a pure Java class.

Change-Id: I99ddffb1ec898fb0f75560d8f2f799085fb1558b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: split off SalCompatibilityProvider 36/7436/1
Robert Varga [Tue, 27 May 2014 19:22:21 +0000 (21:22 +0200)]
BUG-625: split off SalCompatibilityProvider

This patch splits off SalCompatibilityProvider from
ComponentActivator.xtend, lowering the amount of xtend code present in
the code base.

Change-Id: I6fdc9d42c2b39a226afd13883ac26bc7d3ee4866
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-625: convert DataPacketAdapter 35/7435/1
Robert Varga [Tue, 27 May 2014 18:48:15 +0000 (20:48 +0200)]
BUG-625: convert DataPacketAdapter

This patch converts DataPacketAdapter from xtend to pure java. Same
level of functionality should be retained.

Change-Id: I72371da9bee9dd6b26851eb6c9635c0995e7ce97
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-620: replace xtend version of classes with Java versions 71/7271/5
Robert Varga [Tue, 20 May 2014 23:08:23 +0000 (16:08 -0700)]
BUG-620: replace xtend version of classes with Java versions

replace xtend versions of classes with java versions where the java was
generated by hand based on the source of the xtend file as well as leveraging
the code generated from the xtend source

Change-Id: I36a3a61608710543f66c36f7d5179cf976257953
Signed-off-by: David K. Bainbridge <dbainbri.ciena@gmail.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1010: Implement restconf error responses 25/7125/11
tpantelis [Thu, 8 May 2014 18:25:02 +0000 (14:25 -0400)]
Bug 1010: Implement restconf error responses

- RestconfError (new): encapsulates error information as defined in the
  RESTCON RFC.

- RestconfDocumentedException (new): exception that wraps RestconError info.

- RestconfDocumentedExceptionMapper (new): JAX-RS ExceptionMapper that
  translates a RestconfDocumentedException appropriately to XML or
  JSON depending on the user's mime type.

- JsonMapper: modified to handle null child schema as restconf error-info
  is defined as 'anyxml' and thus no schema may be present.

- ControllerContext: added getRestconfModuleErrorsSchemaNode method to
  obtain the 'errors' container schema from the ietf-restconf module.

- Removed ResponseException and changed occurrences in various classes that
  threw ResponseException to throw RestconfDocumentedException instead.

- Added unit tests for new classes and modified existing ones
  accordingly.

Change-Id: Idbe6f6cae9b40ba14701ee05dfadfdd51e961c6b
Signed-off-by: tpantelis <tpanteli@brocade.com>
9 years agoMerge "BUG-731: fix duplicate entry warning"
Tony Tkacik [Tue, 27 May 2014 13:55:34 +0000 (13:55 +0000)]
Merge "BUG-731: fix duplicate entry warning"

9 years agoBUG-731: fix duplicate entry warning 19/7419/1
Robert Varga [Tue, 27 May 2014 10:45:11 +0000 (12:45 +0200)]
BUG-731: fix duplicate entry warning

This removes the duplicate entry which maven warns about.

Change-Id: Id4a92bd63078692acd1307688fb2ba2edb91657c
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoRegistered SecGroup/Rules in netconfig.Neutron Activator 10/7410/1
Brent Salisbury [Tue, 27 May 2014 02:23:20 +0000 (22:23 -0400)]
Registered SecGroup/Rules in netconfig.Neutron Activator

This patch initiates the Sec CRUD interfaces.

Change-Id: Idf5ac503bbc04f1377bf89afa037e5e9d763d35d
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoBug 1073: Introduced Transaction Chain to DOMStore APIs. 94/7394/3
Tony Tkacik [Mon, 26 May 2014 10:03:23 +0000 (12:03 +0200)]
Bug 1073: Introduced Transaction Chain to DOMStore APIs.

Introduced concept of TransactionChain to DOMStore APIs.
Decomposed DOMStore to DOMStoreTransactionFactory
to allow factory methods reuse between DOMStoreTransactionChain
and DOMStore itself.

Change-Id: I186242e40e8ada098deb431b09db67707371af58
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "BUG-624 make netconf tcp address optional in config.ini with default value...
Tony Tkacik [Mon, 26 May 2014 19:49:08 +0000 (19:49 +0000)]
Merge "BUG-624 make netconf tcp address optional in config.ini with default value set to 127.0.0.1:8383"

9 years agoMerge "Bug 1036 - Allow using container in case stmt to preserve uniqueness."
Tony Tkacik [Mon, 26 May 2014 19:48:32 +0000 (19:48 +0000)]
Merge "Bug 1036 - Allow using container in case stmt to preserve uniqueness."

9 years agoMerge changes I7c36c88e,I7c5d97c7
Tony Tkacik [Mon, 26 May 2014 19:30:58 +0000 (19:30 +0000)]
Merge changes I7c36c88e,I7c5d97c7

* changes:
  BUG-1070: make BundleContext required
  BUG-1070: allow for URL registration failing

9 years agoMerge "Neutron API v2.0 bindings and APIs for security groups/rules."
Madhu Venugopal [Mon, 26 May 2014 14:42:53 +0000 (14:42 +0000)]
Merge "Neutron API v2.0 bindings and APIs for security groups/rules."

9 years agoBUG-624 make netconf tcp address optional in config.ini with default value set to... 98/6198/5
Tomas Olvecky [Mon, 26 May 2014 09:49:00 +0000 (11:49 +0200)]
BUG-624 make netconf tcp address optional in config.ini with default value set to 127.0.0.1:8383

Change-Id: I2a5732bd6bbb010b03d7daebb6bf30633ad536fb
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBUG-1070: make BundleContext required 89/7389/1
Robert Varga [Mon, 26 May 2014 08:05:40 +0000 (10:05 +0200)]
BUG-1070: make BundleContext required

It does not make sense to instantiated
GlobalBundleScanningSchemaServiceImpl without a bundlecontext, so let's
make it required in the constructor, making interactions more clear.

Change-Id: I7c36c88e2e26163e0ef41480ea8f5d1d79353e5f
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-1070: allow for URL registration failing 88/7388/1
Robert Varga [Mon, 26 May 2014 07:56:15 +0000 (09:56 +0200)]
BUG-1070: allow for URL registration failing

As part of the error reporting effor, the API contract will change, such
that the URLs can get parsed during registration, potentially throwing a
checked exception. This adds the preparatory groundwork and optimized
the codepath, as it's called repeatedly during controller startup.

Change-Id: I7c5d97c7be6cc488f8b61a99d8e27804ce24e523
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1003: Restconf - remove whitespace on input 66/7466/1
tpantelis [Mon, 26 May 2014 05:47:18 +0000 (01:47 -0400)]
Bug 1003: Restconf - remove whitespace on input

JsonReader, XmlReader:
   - Trimmed whitespace on leaf data input

AbsractRpcExecutor, BrokerRpcExecutor, MountPointRpcExecutor:
   - Modified to handle IllegalArgumentEx and UnsupportedOperationEx
     thrown from invokeRpc to throw appropriate ResconfDocumentedEx.

ResconfDocumentedExeptionMapper, RestconfError, RestconfErrorTest:
   - I discovered that the Response.Status.NOT_IMPLEMENTED jaxrs enum
     is defined in the enum class that is used at compile time but
     isn't defined in the run time enum class provided by jersey.
     So I changed RestconfError.ErrorTag to store the integer status
     code (501) instead of the enum. Ideally compile and run time
     should use the same lib.

- SchemaAwareRpcBroker:
   - Modified to throw UnsupportedOperationEx if no RPC impl is found
     so the restconf front-end can yield the appropriate
     501 (Not Implemented) status code.

Change-Id: Ibfa1dc7ff1526b6d352b9f4e6be2aae0d19ab655
Signed-off-by: tpantelis <tpanteli@brocade.com>
9 years agoNeutron API v2.0 bindings and APIs for security groups/rules. 69/7369/1
Brent Salisbury [Sat, 24 May 2014 23:52:44 +0000 (19:52 -0400)]
Neutron API v2.0 bindings and APIs for security groups/rules.

-This is to enhance the ODL/OpenStack ML2 integration
work to include port security services.

https://wiki.openstack.org/wiki/Neutron/APIv2-specification

Change-Id: Ice5c2fd12381732ab1cbb2394fd67ffed1dcf62c
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
9 years agoMerge changes I8dc2b4df,I09e448f4
Tony Tkacik [Fri, 23 May 2014 15:11:10 +0000 (15:11 +0000)]
Merge changes I8dc2b4df,I09e448f4

* changes:
  Bug 1062 - Disallow implicit serviceref creation.
  Bug 1062 - Allow multiple service references with same name.

9 years agoMerge "BUG-770: NumberFormatException for input string on switch OFPT_HELLO"
Tony Tkacik [Fri, 23 May 2014 15:06:17 +0000 (15:06 +0000)]
Merge "BUG-770: NumberFormatException for input string on switch OFPT_HELLO"

9 years agoMerge "BUG-868: migrate InstanceIdentifer.builder() users"
Tony Tkacik [Fri, 23 May 2014 15:03:27 +0000 (15:03 +0000)]
Merge "BUG-868: migrate InstanceIdentifer.builder() users"

9 years agoMerge changes Ieef23a07,I8057763e
Tony Tkacik [Fri, 23 May 2014 15:02:57 +0000 (15:02 +0000)]
Merge changes Ieef23a07,I8057763e

* changes:
  BUG-868: migrate users of CompositeNode.getChildren()
  BUG-731: Warning suppression is not necessary

9 years agoMerge "BUG-509: introduce Version concept"
Tony Tkacik [Fri, 23 May 2014 14:09:24 +0000 (14:09 +0000)]
Merge "BUG-509: introduce Version concept"

9 years agoMerge "BUG-509: fix ModifiedNode locking"
Tony Tkacik [Fri, 23 May 2014 14:08:59 +0000 (14:08 +0000)]
Merge "BUG-509: fix ModifiedNode locking"

9 years agoMerge "BUG-509: migrate to TreeNodes"
Tony Tkacik [Fri, 23 May 2014 14:07:44 +0000 (14:07 +0000)]
Merge "BUG-509: migrate to TreeNodes"

9 years agoMerge "BUG-509: create data tree SPI package"
Tony Tkacik [Fri, 23 May 2014 13:56:42 +0000 (13:56 +0000)]
Merge "BUG-509: create data tree SPI package"

9 years agoMerge "BUG-509: add some documentation"
Tony Tkacik [Fri, 23 May 2014 13:56:17 +0000 (13:56 +0000)]
Merge "BUG-509: add some documentation"

9 years agoMerge "Bug 716: Errors on controller shutdown"
Tony Tkacik [Fri, 23 May 2014 12:42:54 +0000 (12:42 +0000)]
Merge "Bug 716: Errors on controller shutdown"

9 years agoMerge "Bug 735 - Part 2 - Modify controller to reference new yang-types bundle and...
Tony Tkacik [Fri, 23 May 2014 12:34:21 +0000 (12:34 +0000)]
Merge "Bug 735 - Part 2 - Modify controller to reference new yang-types bundle and and ietf-bundles."

9 years agoBUG-868: migrate InstanceIdentifer.builder() users 59/7359/1
Robert Varga [Fri, 23 May 2014 10:42:05 +0000 (12:42 +0200)]
BUG-868: migrate InstanceIdentifer.builder() users

This moves the users to the (relatively) new convenience methods,
freeing up the static builder() method.

Change-Id: I4112cba3e6794bb38e9523b770b5ae81959d1375
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-868: migrate users of CompositeNode.getChildren() 58/7358/1
Robert Varga [Fri, 23 May 2014 10:35:19 +0000 (12:35 +0200)]
BUG-868: migrate users of CompositeNode.getChildren()

This converts the callers from getChildren() to getValue(), eliminating
around a hundred of warnings in eclipse.

Change-Id: Ieef23a07ac02b719866ec447a7e3365ab11e150a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-731: Warning suppression is not necessary 57/7357/1
Robert Varga [Fri, 23 May 2014 10:09:44 +0000 (12:09 +0200)]
BUG-731: Warning suppression is not necessary

This removes unnecessary SuppressWarnings.

Change-Id: I8057763e9c9b71a52b2f615b0ffafb0dee3cbe78
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: introduce Version concept 51/7351/2
Robert Varga [Thu, 22 May 2014 21:35:02 +0000 (23:35 +0200)]
BUG-509: introduce Version concept

This patch introduces the concept of a Version, which is disconnected
from any ordinal number. This is useful for saving memory, as the
versioning of TreeNodes needs to only detect version mismatches and not
which version is historically newer.

Change-Id: I625d9d945ff3fd416dd82bb3f1ff4268f2001e5a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: fix ModifiedNode locking 50/7350/2
Robert Varga [Thu, 22 May 2014 21:50:05 +0000 (23:50 +0200)]
BUG-509: fix ModifiedNode locking

This removes the 'sealed' flag from ModifiedNode, as it is not a
publicly-visible object. Also drop the synchronized blocks and
reintroduce them in InMemoryDataTreeModification, which is the user
entrypoint.

Change-Id: I6c8be61701134bd8f645b8d4f0a8ef3ae218f0ac
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: migrate to TreeNodes 46/7346/2
Robert Varga [Thu, 22 May 2014 20:58:55 +0000 (22:58 +0200)]
BUG-509: migrate to TreeNodes

This patch performs the switchover to SPI-provided TreeNodes. It also
extracts the information needed for checking applicability of a
modification into a separate interface. Also adds some documentation in
the non-trivial write+merge path.

Change-Id: I83f5ca30bff21774759f9b675b19b6e9622076a2
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: create data tree SPI package 45/7345/2
Robert Varga [Thu, 22 May 2014 20:49:47 +0000 (22:49 +0200)]
BUG-509: create data tree SPI package

This patch introduces an SPI package, which contains the metadata tree
node abstraction and reference implementation. This will substitute the
StoreMetadataNode class.

Major improvement is the isolation of lifecycle from the rest of the
implementation and major reduction in memory usage, as leaf nodes no
longer need to lug a HashMap around.

Change-Id: I89215672006b1ed6064feaf186c94c05550d299e
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: add some documentation 44/7344/2
Robert Varga [Thu, 22 May 2014 05:38:07 +0000 (07:38 +0200)]
BUG-509: add some documentation

Documents AlwaysFailOperation and DataNodeContainerModificationStrategy

Change-Id: Ibb67dc5f4a829547538ba02c3eac4f995a6fe6ef
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 1036 - Allow using container in case stmt to preserve uniqueness. 54/7354/1
Tomas Olvecky [Tue, 20 May 2014 12:26:07 +0000 (14:26 +0200)]
Bug 1036 - Allow using container in case stmt to preserve uniqueness.

Modify yang-jmx-generator and config-netconf-connector to allow adding
dummy container node.
This allows declaring multiple config modules with same attributes within
single yang module.

Change-Id: I49ae30143e45f590f4be6b4713e048bdf9e72edb
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBug 1062 - Disallow implicit serviceref creation. 29/7329/1
Tomas Olvecky [Thu, 22 May 2014 09:46:21 +0000 (11:46 +0200)]
Bug 1062 - Disallow implicit serviceref creation.

Remove auto registration of service references by netconf. Old behaviour
was adding ref_ + module name for each interface module implements even
if it is not declared in /services node.

Fix code style warning in config-netconf-connector.

Change-Id: I8dc2b4dffac212d9b8b8243ccd7aaf290b87499b
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBug 1062 - Allow multiple service references with same name. 28/7328/1
Tomas Olvecky [Thu, 22 May 2014 08:23:02 +0000 (10:23 +0200)]
Bug 1062 - Allow multiple service references with same name.

One module should allow multiple service references with same name
as long as each reference uses different service interface.

Change-Id: I09e448f498ad9bd4fbe005789fa29037e202dd38
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
9 years agoBUG-509: break up SchemaAwareApplyOperation 43/7343/1
Robert Varga [Wed, 21 May 2014 11:55:41 +0000 (13:55 +0200)]
BUG-509: break up SchemaAwareApplyOperation

This patch breaks up the SchemaAwareApplyOperation class by moving its
abstract subclasses out, allowing their subclasses to be retained within
them. This will allow to better understand the relationships between the
classes.

Change-Id: I0acf48fa7c38d600fe38a8ec9951858f46be18e0
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: move snapshotCache get out of try block 42/7342/1
Robert Varga [Wed, 21 May 2014 13:21:14 +0000 (15:21 +0200)]
BUG-509: move snapshotCache get out of try block

This just moves the get which cannot throw out of the 'catch Exception'
block.

Change-Id: I936e987fa6b9e8b3eecb35656c586e3afb070046
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-868: remove the use of Javassist.init() 22/7322/2
Robert Varga [Wed, 21 May 2014 21:55:18 +0000 (23:55 +0200)]
BUG-868: remove the use of Javassist.init()

The init method, as well as setPool() have been deprecated. Prefer the
in-one-go costructor.

Change-Id: I73298d3b36502c0bad0c09f2f7f2d87bb67bbb37
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Fix for Bug 934 - issue in validations for nuetronPort creation and updatePort"
Ed Warnicke [Thu, 22 May 2014 01:08:59 +0000 (01:08 +0000)]
Merge "Fix for Bug 934 - issue in validations for nuetronPort creation and updatePort"

9 years agoBug 735 - Part 2 - Modify controller to reference new yang-types bundle and and ietf... 50/7250/4
Devin Avery [Tue, 20 May 2014 15:03:07 +0000 (11:03 -0400)]
Bug 735 - Part 2 - Modify controller to reference new yang-types bundle and and ietf-bundles.

Patch 1: Set up the restconf bundle to reference the ietf-restconf and ietf-yangtypes-2013 bundles respectively.

Patch 2: Kick off another jenkins build now that dependent artifacts exist.

Patch 3/4: Fixed version issue.

Change-Id: I68b8edc577f5b2e84661a8a4eaed2078c0623aab
Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoMerge "BUG-509: merge InMemoryDataTreeModification.resolveSnapshot()"
Tony Tkacik [Wed, 21 May 2014 17:24:58 +0000 (17:24 +0000)]
Merge "BUG-509: merge InMemoryDataTreeModification.resolveSnapshot()"

9 years agoMerge "BUG-509: there is only one createRecursively()"
Tony Tkacik [Wed, 21 May 2014 17:23:52 +0000 (17:23 +0000)]
Merge "BUG-509: there is only one createRecursively()"

9 years agoMerge "BUG-509: Remove unused methods"
Tony Tkacik [Wed, 21 May 2014 17:23:08 +0000 (17:23 +0000)]
Merge "BUG-509: Remove unused methods"

9 years agoMerge "BUG-509: node version is always required"
Tony Tkacik [Wed, 21 May 2014 17:22:30 +0000 (17:22 +0000)]
Merge "BUG-509: node version is always required"

9 years agoMerge "Bug 992 - Fix broken netconf xml serialization."
Tony Tkacik [Wed, 21 May 2014 16:18:51 +0000 (16:18 +0000)]
Merge "Bug 992 - Fix broken netconf xml serialization."

9 years agoBUG-509: merge InMemoryDataTreeModification.resolveSnapshot() 95/7295/2
Robert Varga [Wed, 21 May 2014 09:40:36 +0000 (11:40 +0200)]
BUG-509: merge InMemoryDataTreeModification.resolveSnapshot()

This patch adds some minimal documentation and merges the two
resolveSnapshot() methods into one, making the call stack a bit easier
to understand.

Change-Id: Ib23fccdc9d2987aa255483becc63155904ebc332
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: there is only one createRecursively() 94/7294/2
Robert Varga [Tue, 20 May 2014 14:25:33 +0000 (16:25 +0200)]
BUG-509: there is only one createRecursively()

The naming and exposure of two and three arugment variants made things
confusing -- let it be clear there is only one version.

Change-Id: If05620e99c2200ee10c1881de8eecd015f18eb9b
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: Remove unused methods 93/7293/2
Robert Varga [Tue, 20 May 2014 14:12:41 +0000 (16:12 +0200)]
BUG-509: Remove unused methods

These two have no users, so let's remove them to make navigating the
code easier.

Change-Id: I515570db5a8a4095ff525f1ca5614f9f627616df
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: node version is always required 92/7292/2
Robert Varga [Tue, 20 May 2014 13:42:32 +0000 (15:42 +0200)]
BUG-509: node version is always required

This just clarifies the requirement to know the node version you are
attempting to build before instantiating a builder. Also remove some
unused methods.

Change-Id: I09406bbedee963624b43a280529d4b8cbc9931c6
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "BUG-509: cleanup StoreMetadataNode"
Tony Tkacik [Wed, 21 May 2014 15:19:53 +0000 (15:19 +0000)]
Merge "BUG-509: cleanup StoreMetadataNode"

9 years agoMerge "BUG-509: Refactor listener walking"
Tony Tkacik [Wed, 21 May 2014 15:19:27 +0000 (15:19 +0000)]
Merge "BUG-509: Refactor listener walking"

9 years agoCouple of warnings 90/7290/1
Robert Varga [Tue, 20 May 2014 10:05:49 +0000 (12:05 +0200)]
Couple of warnings

This fixes a couple of warnings about pom.xml declaring duplicate things
(groupId, version).

Change-Id: Idb6e362a78cfa5d96609db6ebcc581e9349a08a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: cleanup StoreMetadataNode 91/7291/1
Robert Varga [Tue, 20 May 2014 13:10:29 +0000 (15:10 +0200)]
BUG-509: cleanup StoreMetadataNode

Removes StoreTreeNode<StoreMetadataNode> interface and tightens
visibility of a few methods.

Change-Id: I3bbf303025046f217bdcea81fcc14c420dbf9478
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: Refactor listener walking 44/7244/3
Robert Varga [Tue, 20 May 2014 08:52:59 +0000 (10:52 +0200)]
BUG-509: Refactor listener walking

This patch creates a proper abstraction for examining a
DataTreeCandidate for changes. This has the nice property of finishing
the hiding of all implementation details behind proper interfaces, such
that our implementation is free to do proper lifecycle as it pleases.

Also gets rid of the AutoCloseable from candidate. It can be
reintroduced in the need appears.

Change-Id: I13301548594d4ae34e929c7202661997ea5aca90
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-770: NumberFormatException for input string on switch OFPT_HELLO 89/7289/2
Michal Rehak [Wed, 21 May 2014 08:16:43 +0000 (10:16 +0200)]
BUG-770: NumberFormatException for input string on switch OFPT_HELLO

DatapathId is of type uint64 and only lower 6 bytes are containign MAC address.
If the input exceeds highest positive integer (2**63-1), then parsing to long
failed.
Now it is parsed into BigInteger and only lower 8 bytes are later on used as long.

- moved unit test to test folder

Change-Id: Ie9fe78cde9fb4232209382396c2278dc029d8dca
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Cosmetics: check in pom.xml files as _sort_pom_ wants them to be"
Ed Warnicke [Tue, 20 May 2014 21:55:37 +0000 (21:55 +0000)]
Merge "Cosmetics: check in pom.xml files as _sort_pom_ wants them to be"

9 years agoMerge "Bug 953 - Change the BindingIndependentConnector to handle RpcInvocationStrate...
Tony Tkacik [Tue, 20 May 2014 14:57:56 +0000 (14:57 +0000)]
Merge "Bug 953 - Change the BindingIndependentConnector to handle RpcInvocationStrategies consistently."

9 years agoMerge "BUG-509: Move ModificationApplyOperation"
Tony Tkacik [Tue, 20 May 2014 13:42:35 +0000 (13:42 +0000)]
Merge "BUG-509: Move ModificationApplyOperation"

9 years agoMerge "BUG-509: remove unused code"
Tony Tkacik [Tue, 20 May 2014 13:42:07 +0000 (13:42 +0000)]
Merge "BUG-509: remove unused code"

9 years agoMerge "BUG-509: Move DataTree concepts into separate package"
Tony Tkacik [Tue, 20 May 2014 13:41:49 +0000 (13:41 +0000)]
Merge "BUG-509: Move DataTree concepts into separate package"

9 years agoMerge "BUG-509: simple cleanup of DataTreeModification"
Tony Tkacik [Tue, 20 May 2014 13:39:41 +0000 (13:39 +0000)]
Merge "BUG-509: simple cleanup of DataTreeModification"

9 years agoMerge "BUG-509: Rename MutableDataTree to DataTreeModification"
Tony Tkacik [Tue, 20 May 2014 13:38:12 +0000 (13:38 +0000)]
Merge "BUG-509: Rename MutableDataTree to DataTreeModification"

9 years agoBug 953 - Change the BindingIndependentConnector to handle RpcInvocationStrategies... 06/6906/6
Devin Avery [Mon, 12 May 2014 15:52:51 +0000 (11:52 -0400)]
Bug 953 - Change the BindingIndependentConnector to handle RpcInvocationStrategies consistently.

Patch Set 1/2/3
*Combined the RpcInvocationStrategies into a single intelligence class that handles the varying strategies since the majority of the intelligence was overlapped.
*Moved some logic out of the BindingIndependentConnector to simplify it.
*Added an RpcInvocationStrategyTest to validate logic in RpcInvocationStrategy.

Patch Set 4
* Removed tabs and trailing whitespace

Patch Set 6
* Addressed NPE that would happen when no input was provided to a method requiring input.

Change-Id: I8d6916819105c5530c9b501e1ae973cdcb769ea7
Signed-off-by: Devin Avery <devin.avery@brocade.com>
9 years agoMerge "BUG-731: fix warnings from missing generic arguments"
Tony Tkacik [Tue, 20 May 2014 13:19:25 +0000 (13:19 +0000)]
Merge "BUG-731: fix warnings from missing generic arguments"

9 years agoMerge "BUG-731: fix unused imports"
Tony Tkacik [Tue, 20 May 2014 13:18:37 +0000 (13:18 +0000)]
Merge "BUG-731: fix unused imports"

9 years agoMerge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"
Tony Tkacik [Tue, 20 May 2014 13:11:24 +0000 (13:11 +0000)]
Merge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"

9 years agoMerge "BUG-868: move to use unified ClassLoaderUtils"
Tony Tkacik [Tue, 20 May 2014 12:51:02 +0000 (12:51 +0000)]
Merge "BUG-868: move to use unified ClassLoaderUtils"

9 years agoMerge "BUG-994: introduce object-cache into distribution"
Tony Tkacik [Tue, 20 May 2014 12:50:42 +0000 (12:50 +0000)]
Merge "BUG-994: introduce object-cache into distribution"

9 years agoMerge "Added .DS_STORE and .metadata to .gitignore"
Tony Tkacik [Tue, 20 May 2014 12:46:51 +0000 (12:46 +0000)]
Merge "Added .DS_STORE and .metadata to .gitignore"

9 years agoBUG-509: Move ModificationApplyOperation 43/7243/1
Robert Varga [Tue, 20 May 2014 07:45:36 +0000 (09:45 +0200)]
BUG-509: Move ModificationApplyOperation

This patch moves ModificationApplyOperation at al. to the data tree
package, improving its isolation.

Change-Id: I37081222e30c149a87baf6f4a5d3ce2e84f13acb
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: remove unused code 42/7242/1
Robert Varga [Tue, 20 May 2014 07:21:43 +0000 (09:21 +0200)]
BUG-509: remove unused code

Removes unused code, writen -> written, adds a FIXME

Change-Id: Id0795edc23f2aef6f73e42d54be877003daf4244
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: Move DataTree concepts into separate package 23/7223/2
Robert Varga [Mon, 19 May 2014 09:56:10 +0000 (11:56 +0200)]
BUG-509: Move DataTree concepts into separate package

Create a new package for the data tree and related concepts to clean out
interactions. Also create and document the API and hide implementation
classes from the user itself.

Change-Id: I69f2a9b7bcac863b531f46f669bfd2fcfcd5b743
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: simple cleanup of DataTreeModification 22/7222/2
Robert Varga [Mon, 19 May 2014 09:38:38 +0000 (11:38 +0200)]
BUG-509: simple cleanup of DataTreeModification

Rename rootModification to rootNode to clarify what it is
Use field updated to fix seals to save some memory

Change-Id: I0fe7f58a3c15613c15198830b77bc28a84a9006a
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-509: Rename MutableDataTree to DataTreeModification 21/7221/2
Robert Varga [Mon, 19 May 2014 09:30:53 +0000 (11:30 +0200)]
BUG-509: Rename MutableDataTree to DataTreeModification

This name better reflects the semantics of the class. Also add some
javadoc documentation.

Change-Id: I7292c134bf87af8c0518e2905c7bd2b628c37a25
Signed-off-by: Robert Varga <rovarga@cisco.com>