controller.git
9 years agoFixed platform dependant bugs in maven plugin 73/473/1
Maros Marsalek [Thu, 13 Jun 2013 07:21:59 +0000 (09:21 +0200)]
Fixed platform dependant bugs in maven plugin

Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoAdded Support for Union Type def resolving and bug fixes. 65/465/3
lsedlak [Tue, 11 Jun 2013 15:08:25 +0000 (17:08 +0200)]
Added Support for Union Type def resolving and bug fixes.

Added implementation into TypeProviderImpl to proper resolve union type definitions;
Added UnionDependencySort for correct resolution of multiple unions in same yang model;
Added support for resolving of imported union types from multiple modules;
Added tests for Union Type def resolving;

Fixed Resolving of typedef Enumerations - now the Enumeration is resolved as standalone enum typedef name .java;
Fixed resolving of Inner Enumerations;
Fixed resolving of referenced Inner Enumerations through leafref definition;
Added EnumGenerator class for generating of Enum definitions and inner Enum definitions;
Fixed generation of Enumeration type through code writer;
Fixed generation of Enumeration package name in case of inner enum definition in Class and Generated Transfer Objects;
Added capability to generate inner enums into ClassCodeGenerator and InterfaceGenerator;

Fixed of missing apostrophe in createToString method in GeneratorUtil.java in case when more than one property should be generated in toString method;

Fixed platform specific bug in maven-yang-plugin incorrect retieval of maven dependency in YangToSourcesProcessor.java;
Fixed platform specific bug in maven-yang-plugin-it - hard coded resource paths replaced for getClass().getResource calls;

Added support into BindingGenerator API to suppor of generation of Types with restriction of specified modules that will be generated;
Added implementation of generateTypes in BindingGeneratorImpl;

Added tests and test resources for testing Enumeration gen. types
Added test resources for augment relative xpath testing;

Fixed improper implementation of hashCode and equals in ExtendedType in yang-model-util;
Fixed findParentModule method in SchemaContextUtil in yang-model-util project;

Change-Id: I144acbeec9ce547da856e2979d27b2c072174a52
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoMerge "Checkstyle enforcer"
Madhu Venugopal [Wed, 12 Jun 2013 16:49:08 +0000 (16:49 +0000)]
Merge "Checkstyle enforcer"

9 years agoMerge "Yang-maven-plugin refactored and config attributes and spi adjusted."
Giovanni Meo [Wed, 12 Jun 2013 16:25:22 +0000 (16:25 +0000)]
Merge "Yang-maven-plugin refactored and config attributes and spi adjusted."

9 years agoCheckstyle enforcer 57/457/3
Giovanni Meo [Wed, 12 Jun 2013 15:43:29 +0000 (17:43 +0200)]
Checkstyle enforcer

Started to enforce checkstyle, if the code style doesn't match the
checkstyle settings build will break. This is needed in order to make
sure folks comply to one code style and don't start diverging.

For now the enforcement is only limited to:
- make sure no TABS are present in the java files
- make sure that no trailing whitespaces are present

Along with code style enforcement updates all the files that didn't
comply else compilation would not be successful.

Added new exclusion in .gitignore

Added new parent for commons.opendaylight, please read the README in
the commons.parent project for the reason for it.

Make sure the violation of checkstyle are reported on the console to
avoid for a developer to be able to dig through the log in the target
directory

Change-Id: I4e35aa74e685e5cebb8182caf0b3b39da0906948
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoFixed bug in parser in augment resolving process. 63/463/2
Martin Vitez [Wed, 12 Jun 2013 14:37:50 +0000 (16:37 +0200)]
Fixed bug in parser in augment resolving process.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoFixed parsing of typedef statement. Refactored YangParserImpl to improve code readabi... 56/456/2
Martin Vitez [Tue, 11 Jun 2013 09:55:29 +0000 (11:55 +0200)]
Fixed parsing of typedef statement. Refactored YangParserImpl to improve code readability.
Added methods to LeafSchemaNode interface. Updated tests.

Change-Id: I63c84a5c0c3c4f6c68b8c2dabdcbb66266496000
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoYang-maven-plugin refactored and config attributes and spi adjusted. 44/444/6
Maros Marsalek [Fri, 7 Jun 2013 10:20:29 +0000 (12:20 +0200)]
Yang-maven-plugin refactored and config attributes and spi adjusted.

Removed project base dir parameter from CodeGenerator
since it can be acquired via additionalConfiguration.
Added resourceBaseDir config attribute that allows resources
to be added to packaged jar.
Added mavenProject config attribute that provides any additional
configuration to code generators if necessary.
Adjusted log levels for the plugin.

Plugin refactored and generate sources test fixed.

Change-Id: Ic3cc1342bb8eb8d6cc374da8af28fa9905ee8fcf
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Updated example with OF model done during HackFest."
Giovanni Meo [Mon, 10 Jun 2013 15:24:04 +0000 (15:24 +0000)]
Merge "Updated example with OF model done during HackFest."

9 years agoMerge "Samples/maven-code-gen-sample pom.xml updated after recent changes."
Giovanni Meo [Mon, 10 Jun 2013 15:19:52 +0000 (15:19 +0000)]
Merge "Samples/maven-code-gen-sample pom.xml updated after recent changes."

9 years agoMerge "Modified construction of built-in yang types."
Giovanni Meo [Mon, 10 Jun 2013 15:19:00 +0000 (15:19 +0000)]
Merge "Modified construction of built-in yang types."

9 years agoMerge "Adding Set Next Hop action"
Giovanni Meo [Mon, 10 Jun 2013 14:59:12 +0000 (14:59 +0000)]
Merge "Adding Set Next Hop action"

9 years agoSamples/maven-code-gen-sample pom.xml updated after recent changes. 53/453/1
Maros Marsalek [Mon, 10 Jun 2013 11:18:08 +0000 (13:18 +0200)]
Samples/maven-code-gen-sample pom.xml updated after recent changes.

Added insepctDependencies config attribute.
Yang-maven-plugin integration tests marked as IT and now run by failsafe.

Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoMerge "Manual link addition feature assumes Long for Switch identifier and Short...
Jason Ye [Mon, 10 Jun 2013 06:03:37 +0000 (06:03 +0000)]
Merge "Manual link addition feature assumes Long for Switch identifier and Short for Port identifier. This commit fixes that assumption."

9 years agoFixed Openflow InventoryService to return the property cache. 52/452/1
Madhu Venugopal [Mon, 10 Jun 2013 01:57:00 +0000 (18:57 -0700)]
Fixed Openflow InventoryService to return the property cache.

Change-Id: I82466d3af47e7b0f2bcc1c0cbedc4fef1e25d915
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
9 years agoManual link addition feature assumes Long for Switch identifier and Short for Port... 51/451/1
Madhu Venugopal [Mon, 10 Jun 2013 01:43:22 +0000 (18:43 -0700)]
Manual link addition feature assumes Long for Switch identifier and Short for Port identifier. This commit fixes that assumption.

Change-Id: Ibffd2c1b8704465e928dd180832ad026ce749d48
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
9 years agoMerge "Revert "Checkstyle enforcer""
Madhu Venugopal [Sat, 8 Jun 2013 14:24:11 +0000 (14:24 +0000)]
Merge "Revert "Checkstyle enforcer""

9 years agoRevert "Checkstyle enforcer" 49/449/1
Ed Warnicke [Sat, 8 Jun 2013 14:08:53 +0000 (14:08 +0000)]
Revert "Checkstyle enforcer"

This reverts commit 541d0a36997f292bb037a2199463431eee538358

We are going to talk a bit more about this before doing it.

Change-Id: I788ecea18796c6eb325285dfaa83a6aae300634c

9 years agoMerge "Checkstyle enforcer"
Ed Warnicke [Sat, 8 Jun 2013 05:46:14 +0000 (05:46 +0000)]
Merge "Checkstyle enforcer"

9 years agoCheckstyle enforcer 47/447/2
Giovanni Meo [Fri, 7 Jun 2013 21:17:55 +0000 (23:17 +0200)]
Checkstyle enforcer

Started to enforce checkstyle, if the code style doesn't match the
checkstyle settings build will break. This is needed in order to make
sure folks comply to one code style and don't start diverging.

For now the enforcement is only limited to:
- make sure no TABS are present in the java files
- make sure that no trailing whitespaces are present

Along with code style enforcement updates all the files that didn't
comply else compilation would not be successful.

Added new exclusion in .gitignore

Change-Id: Ic95da373575cec3cfe0c99b31fce92f66bc41263
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoFixed a bug in removeSpanPorts 46/446/1
Youcef Laribi [Fri, 7 Jun 2013 20:51:55 +0000 (13:51 -0700)]
Fixed a bug in removeSpanPorts

Signed-off-by: Youcef Laribi <Youcef.Laribi@citrix.com>
9 years agoUpdated example with OF model done during HackFest. 45/445/1
Tony Tkacik [Fri, 7 Jun 2013 20:44:16 +0000 (13:44 -0700)]
Updated example with OF model done during HackFest.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge changes I029118f9,I4a0320b9
Giovanni Meo [Fri, 7 Jun 2013 16:45:51 +0000 (16:45 +0000)]
Merge changes I029118f9,I4a0320b9

* changes:
  Fixed typo in transform package
  Cleaned up Integration Tests

9 years agoFixed typo in transform package 36/436/2
Tony Tkacik [Tue, 4 Jun 2013 20:31:25 +0000 (13:31 -0700)]
Fixed typo in transform package

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Yang-maven-plugin refactored + fixed bugs. Removed resourceProviders argument...
Giovanni Meo [Fri, 7 Jun 2013 16:11:27 +0000 (16:11 +0000)]
Merge "Yang-maven-plugin refactored + fixed bugs. Removed resourceProviders argument(unused). Other arguments marked as optional. Added argument to set whether use yang files from dependencies or not. Added packaging of yang files from project to META-INF. Added additionalConfiguration argument for code generators."

9 years agoMerge "Finalize the OSGi launcher for the opendaylight distribution"
Ed Warnicke [Fri, 7 Jun 2013 15:11:06 +0000 (15:11 +0000)]
Merge "Finalize the OSGi launcher for the opendaylight distribution"

9 years agoModified construction of built-in yang types. 35/435/3
Martin Vitez [Wed, 5 Jun 2013 14:18:01 +0000 (16:18 +0200)]
Modified construction of built-in yang types.

Base yang types can not be restricted now. Every restriction causes creation of new ExtendedType with default yang type as base type.
Updated tests.

Change-Id: I04b2a0a069dcf4f7b3a3d1220c742fed047cba3a
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoRemoving invalid casts from hosttracker. 42/442/1
Madhu Venugopal [Fri, 7 Jun 2013 04:21:45 +0000 (21:21 -0700)]
Removing invalid casts from hosttracker.

Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
Change-Id: I4a2c7e73a025112ee77a2b0f7058a4d6d593c76a
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
9 years agoAdding Set Next Hop action 39/439/1
Alessandro Boch [Thu, 6 Jun 2013 21:06:27 +0000 (14:06 -0700)]
Adding Set Next Hop action

- It will be ignored by openflow plugin

Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoCleaned up Integration Tests 31/431/5
Tony Tkacik [Tue, 4 Jun 2013 21:26:32 +0000 (14:26 -0700)]
Cleaned up Integration Tests

- Removed dependency version declarations from Integration Tests.
  The version of controller bundles and dependencies is loaded
  from integration test pom files.

- Moved integration tests from test phase to verify.
  The integration tests could be skipped by -DskipITs option.

- Added common base POM for integration tests with pax-exam
  configuration.

Change-Id: I4a0320b97a438bbc2f8234beb34ae246b683c353
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Fix exception in HostTracker when non-OF node is removed."
Giovanni Meo [Wed, 5 Jun 2013 15:14:38 +0000 (15:14 +0000)]
Merge "Fix exception in HostTracker when non-OF node is removed."

9 years agoMerge "FlowProgrammer.Northbound test"
Giovanni Meo [Wed, 5 Jun 2013 15:12:59 +0000 (15:12 +0000)]
Merge "FlowProgrammer.Northbound test"

9 years agoMerge "Fix to maintain Java 6 compatability"
Giovanni Meo [Wed, 5 Jun 2013 14:43:16 +0000 (14:43 +0000)]
Merge "Fix to maintain Java 6 compatability"

9 years agoMerge "Custom Node Type jaxb string to id"
Giovanni Meo [Wed, 5 Jun 2013 14:40:02 +0000 (14:40 +0000)]
Merge "Custom Node Type jaxb string to id"

9 years agoMerge "Refactored ModuleBuilder to avoid name conflicts. Fixed implementation of...
Giovanni Meo [Wed, 5 Jun 2013 14:38:51 +0000 (14:38 +0000)]
Merge "Refactored ModuleBuilder to avoid name conflicts. Fixed implementation of ChoiceBuilder. Refactored parsing of refine statement. Added tests. Renamed ChildNodeBuilder -> DataNodeContainerBuilder. Renamed AbstractChildNodeBuilder -> AbstractDataNodeContainerBuilder. Renamed TypedefBuilder -> TypeDefinitionBuilderImpl."

9 years agoRemoved Equals/HashCodeBuilder for ARP/LLDPTLV 23/423/3
Ed Warnicke [Mon, 3 Jun 2013 22:41:14 +0000 (17:41 -0500)]
Removed Equals/HashCodeBuilder for ARP/LLDPTLV

This also entailed fixing equals and HashCodeBuilder for Packet.

Change-Id: I5497a719d51becfd0019fada2c7f171fadfbdb13
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoYang-maven-plugin refactored + fixed bugs. 06/406/6
Maros Marsalek [Thu, 30 May 2013 09:49:22 +0000 (11:49 +0200)]
Yang-maven-plugin refactored + fixed bugs.
Removed resourceProviders argument(unused).
Other arguments marked as optional.
Added argument to set whether use yang files from dependencies or not.
Added packaging of yang files from project to META-INF.
Added additionalConfiguration argument for code generators.

Yang-maven-plugin SPI, ResourceProvider interface removed since
it was unused. Code generator interface improved.

YangParserImpl API changed to provide a map<File, Module>. Users will
know which module belongs to which file and can utilize this information
when parsing yang files from multiple sources. Yang-maven-plugin needs
this information since it parses yang files from project as well as its
dependencies.

Change-Id: I15c53df59c4104793e023ad3686b031ce0ba8cd3
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
9 years agoFinalize the OSGi launcher for the opendaylight distribution 29/429/2
Giovanni Meo [Tue, 4 Jun 2013 15:06:50 +0000 (17:06 +0200)]
Finalize the OSGi launcher for the opendaylight distribution

In this commit following changes are being done:
1) Adjusted opendaylight-osgi-launcher-local.launch not to include
bundles that are clustering.stub and protocol_plugin.stub because
those are only meant for integration testing
2) Modifed the opendaylight.target to refer to an http repository so
eventual problem with certificates will not be seen, using the https
url of jenkins on some system has been causing problems because the
root certificate for jenkins was not known.
3) Adjusted the opendaylight-osgi-launcher.launch not to include the
bundles that are clustering.stub and protocol_plugin.stub because
those are only meant for integration testing
4) Adjust the opendaylight-osgi-launcher.launch to make sure the
jersey libraries startup soon else an harmless yet annoying error
would be printed
5) Moved clusterin.test bundle off Declarative service else the
OSGI-INF/component.xml location even though works for built done via
maven will not work for builds done via eclipse PDE.

Change-Id: Ic2f2196514dc8c7c5af419f81c6f46e7eb29aed1
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoFix exception in HostTracker when non-OF node is removed. 34/434/1
Jason Ye [Wed, 5 Jun 2013 06:33:08 +0000 (23:33 -0700)]
Fix exception in HostTracker when non-OF node is removed.

Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoFlowProgrammer.Northbound test 33/433/2
Kalvin Hom [Wed, 5 Jun 2013 01:15:47 +0000 (18:15 -0700)]
FlowProgrammer.Northbound test

Added northbound integration tests
for adding, getting, and deleting
flows.

Change-Id: I2ed169db37ff065d650b84e29f8801744c061c26
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoMerge "Fixed a bug in deriving Switch Mac-address and a null check on set payload...
Alessandro Boch [Wed, 5 Jun 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fixed a bug in deriving Switch Mac-address and a null check on set payload on ip packet Change-Id:I91cd687f3177829862b6aac4a8bce8bd53f7baa5 Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>"

9 years agoFixed a bug in deriving Switch Mac-address and a null check on set payload on ip... 32/432/2
Madhu Venugopal [Tue, 4 Jun 2013 23:40:02 +0000 (16:40 -0700)]
Fixed a bug in deriving Switch Mac-address and a null check on set payload on ip packet
Change-Id:I91cd687f3177829862b6aac4a8bce8bd53f7baa5
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
9 years agoMerge "Principal to contain all the user roles"
Madhu Venugopal [Tue, 4 Jun 2013 23:21:55 +0000 (23:21 +0000)]
Merge "Principal to contain all the user roles"

9 years agoFix to maintain Java 6 compatability 30/430/1
Ed Warnicke [Tue, 4 Jun 2013 20:01:22 +0000 (15:01 -0500)]
Fix to maintain Java 6 compatability

Swapped out the use of Integer.compare (which requires Java 7)
for Integer.valueOf(x).compareTo(Integer.valueOf(y)) which
is promised to return the identical value here:
http://docs.oracle.com/javase/7/docs/api/java/lang/Integer.html#compare(int, int)

Change-Id: I78d325351dac312d120f5c598ec9155d31cfb689
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoCustom Node Type jaxb string to id 13/413/3
Kalvin Hom [Fri, 31 May 2013 01:48:37 +0000 (18:48 -0700)]
Custom Node Type jaxb string to id

When using the web services, nodeIDString
needs to be parsed into the correct
type to get the nodeID when it is not
one of the preset Node types.

Change-Id: Ic55b440e0a5a951f9f8c6c167e1e1bcfa8c3b107
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoRefactored ModuleBuilder to avoid name conflicts. Fixed implementation of ChoiceBuilder. 28/428/1
Martin Vitez [Tue, 4 Jun 2013 13:45:29 +0000 (15:45 +0200)]
Refactored ModuleBuilder to avoid name conflicts. Fixed implementation of ChoiceBuilder.
Refactored parsing of refine statement. Added tests.
Renamed ChildNodeBuilder -> DataNodeContainerBuilder.
Renamed AbstractChildNodeBuilder -> AbstractDataNodeContainerBuilder.
Renamed TypedefBuilder -> TypeDefinitionBuilderImpl.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "- Added osgi cmds so that user is able to configure a link. The link is added...
Madhu Venugopal [Tue, 4 Jun 2013 11:14:08 +0000 (11:14 +0000)]
Merge "- Added osgi cmds so that user is able to configure a link. The link is added to the main Topology if it's not a Production link."

9 years agoPrincipal to contain all the user roles 27/427/1
Alessandro Boch [Tue, 4 Jun 2013 02:19:28 +0000 (19:19 -0700)]
Principal to contain all the user roles

- Added IUserManager.getUserLevels() which returns all the controller levels for the passed user
- Modified CustomRealm to return a principal containing all the controller roles for the passed user
- Code style and format changes for the touched files

Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years ago- Added osgi cmds so that user is able to configure a link. The link is added to... 25/425/1
Jason Ye [Tue, 4 Jun 2013 02:41:32 +0000 (19:41 -0700)]
- Added osgi cmds so that user is able to configure a link. The link is added to the main Topology if it's not a Production link.

Usage:

addUserLink <name> <node connector string> <node connector string>
deleteUserLink <name>
printUserLink

- Fixed an exception in SwitchManager osgi cmd pns

Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Replaced Equals/HashcodeBuilder for DatapacketListener"
Alessandro Boch [Mon, 3 Jun 2013 22:19:15 +0000 (22:19 +0000)]
Merge "Replaced Equals/HashcodeBuilder for DatapacketListener"

9 years agoNode MAC address to be derived inside the protocol plugin 22/422/4
Alessandro Boch [Mon, 3 Jun 2013 16:46:09 +0000 (09:46 -0700)]
Node MAC address to be derived inside the protocol plugin

- Moved network node's MAC computation from switch mgr to InventoryShimService in protocol plugin
- Modified MAC property to only carry network node MAC
- Some automatic coding style changes
- Some static analysis fix

Change-Id:I8481176d3fa3fcc004f642ea865b7be3593bdfc4
Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoFix exceptions in SwitchManager Web in case of non-OF nodes and node connectors 21/421/1
Jason Ye [Mon, 3 Jun 2013 06:12:02 +0000 (23:12 -0700)]
Fix exceptions in SwitchManager Web in case of non-OF nodes and node connectors

Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoReplaced Equals/HashcodeBuilder for DatapacketListener 20/420/1
Ed Warnicke [Sun, 2 Jun 2013 22:47:53 +0000 (17:47 -0500)]
Replaced Equals/HashcodeBuilder for DatapacketListener

Change-Id: I7e1bcf6937e503bb6b63bbb949bcbf8d3092f413
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Add 'TableStatistics' to SAL and Northbound Statistics API."
Alessandro Boch [Sun, 2 Jun 2013 18:33:20 +0000 (18:33 +0000)]
Merge "Add 'TableStatistics' to SAL and Northbound Statistics API."

9 years agoAdd 'TableStatistics' to SAL and Northbound Statistics API. 18/418/6
Aditya Prakash Vaja [Fri, 31 May 2013 19:28:15 +0000 (12:28 -0700)]
Add 'TableStatistics' to SAL and Northbound Statistics API.

It is similar to the FlowStats and PortStats (NodeConnectorStats) that are present now.

Change-Id: Ibecb95c9c4a4f911e5fd3847bbf1f2e77eb16be1
Signed-off-by: Aditya Prakash Vaja <aditya.vaja@bigswitch.com>
9 years ago- SAL Inventory needs to be modified to be able to take multiple IPluginInInventorySe... 17/417/1
Jason Ye [Fri, 31 May 2013 18:17:55 +0000 (11:17 -0700)]
- SAL Inventory needs to be modified to be able to take multiple IPluginInInventoryService providers. Same applies to IListenInventoryUpdates.
- Plugin needs to introduce a wrapper of SAL interface if it's going to be used locally within the plugin.

Signed-off-by: Jason Ye <yisye@cisco.com>
9 years agoMerge "Add hosttracker northbound integration test. This modification depends on...
Giovanni Meo [Fri, 31 May 2013 14:46:23 +0000 (14:46 +0000)]
Merge "Add hosttracker northbound integration test. This modification depends on change-id I760800: NodeConnector custom type"

9 years agoMerge "Refactored SchemaPath for yang java types. Fixed SchemaPath for augmented...
Giovanni Meo [Fri, 31 May 2013 14:35:04 +0000 (14:35 +0000)]
Merge "Refactored SchemaPath for yang java types. Fixed SchemaPath for augmented nodes types. Updated yang java types constructors. Updated tests accordingly."

9 years agoMerge "NodeConnector custom type"
Giovanni Meo [Fri, 31 May 2013 14:01:38 +0000 (14:01 +0000)]
Merge "NodeConnector custom type"

9 years agoRefactored SchemaPath for yang java types. Fixed SchemaPath for augmented nodes types. 11/411/3
Martin Vitez [Thu, 30 May 2013 14:03:54 +0000 (16:03 +0200)]
Refactored SchemaPath for yang java types. Fixed SchemaPath for augmented nodes types.
Updated yang java types constructors. Updated tests accordingly.

Change-Id: Ifeb1ddc96c89350579c837414dceeab624ef17ab
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoFix method getFlowEntriesForGroup in forwardingrulesmanager 14/414/1
Sapan Shah [Fri, 31 May 2013 01:46:40 +0000 (18:46 -0700)]
Fix method getFlowEntriesForGroup in forwardingrulesmanager

Signed-off-by: Sapan Shah <sapshah@cisco.com>
9 years agoAdd hosttracker northbound integration test. 12/412/1
taochang [Thu, 30 May 2013 22:58:46 +0000 (15:58 -0700)]
Add hosttracker northbound integration test.
This modification depends on change-id I760800: NodeConnector custom type

Change-Id: Ia3703664bb83743ab00d75c930f4b4b16bc4c898
Signed-off-by: taochang <taochang@cisco.com>
9 years agoNodeConnector custom type 03/403/1
Kalvin Hom [Wed, 29 May 2013 19:18:06 +0000 (12:18 -0700)]
NodeConnector custom type

Changes for NodeConnector to create
new NodeConnector of custom type;

Created STUB implementation for
protocol plugin;

Reordered NodeFactory's arguments
to be consistent with other methods;

Change-Id: I7608005985f6f61f54d4339290191574ea6450c6
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoMerge "Bumped version of Maven YANG tools to 0.5.1-SNAPSHOT"
Giovanni Meo [Wed, 29 May 2013 16:32:29 +0000 (16:32 +0000)]
Merge "Bumped version of Maven YANG tools to 0.5.1-SNAPSHOT"

9 years agoBumped version of Maven YANG tools to 0.5.1-SNAPSHOT 97/397/5
Tony Tkacik [Tue, 28 May 2013 14:44:41 +0000 (16:44 +0200)]
Bumped version of Maven YANG tools to 0.5.1-SNAPSHOT

 - Removed unnecessary dependencies from YANG Maven Tools integration tests.
 - Added Attach Sources and Javadoc to deploy phase

Change-Id: I456c06538c944ae53d4f12827be4a64726b8233b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoMerge "Added extensible implementation of Transformators"
Giovanni Meo [Wed, 29 May 2013 14:30:08 +0000 (14:30 +0000)]
Merge "Added extensible implementation of Transformators"

9 years agoMerge "Correct maven dependency for MavenProject"
Giovanni Meo [Wed, 29 May 2013 14:13:51 +0000 (14:13 +0000)]
Merge "Correct maven dependency for MavenProject"

9 years agoAdded extensible implementation of Transformators 02/402/1
Tony Tkacik [Tue, 28 May 2013 11:26:05 +0000 (13:26 +0200)]
Added extensible implementation of Transformators

- set of generic Transformers - factories responsible for producing
  outputs based on input objects
  - Ideal for development of translation layers between protocol
  specific objects and abstract transfer objects such as Actions in SAL.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoCorrect maven dependency for MavenProject 01/401/2
Robert Varga [Wed, 29 May 2013 02:41:21 +0000 (04:41 +0200)]
Correct maven dependency for MavenProject

The name of the artifact which exports
org.apache.maven.project.MavenProject has changed between maven 2.x and
3.x to mave-core. Update the dependency to pick up the changes, which
include generics -- allowing for safer codegen.

Change-Id: I6237eb935e837e8ff887f8e072be12dd8ddb4c8c
Signed-off-by: Martin Vitez <mvitez@cisco.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
9 years agoStatistics Northbound Integration Test 00/400/1
Kalvin Hom [Wed, 29 May 2013 01:02:38 +0000 (18:02 -0700)]
Statistics Northbound Integration Test

Added northbound tests for node specific
requests

Change-Id: I7e0c1ce446f91d29665837fac645ea09693f29d9
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoNodeFactory service 99/399/2
Kalvin Hom [Tue, 28 May 2013 23:41:12 +0000 (16:41 -0700)]
NodeFactory service

Added INodeFactory interface in SAL to
handle creation of different Node types;

Node will use INodeFactory to create Nodes
that are not one of the preset types;

StubNodeFactory for plugin stub creates
Nodes of STUB type;

Change-Id: I727eb7e4eae8daacf732b0856f6d0cc1d55ba749
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoExtend getJsonResult() to accommodate HTTP methods other than "GET". 98/398/1
taochang [Tue, 28 May 2013 21:43:36 +0000 (14:43 -0700)]
Extend getJsonResult() to accommodate HTTP methods other than "GET".
Also pass the HTTP response code to calling program.

Change-Id: Ie5ff6af9765a82ea5dbf7d2108da081b15c65d76
Signed-off-by: taochang <taochang@cisco.com>
9 years agoMerge "Fixed dependency management."
Giovanni Meo [Tue, 28 May 2013 18:30:52 +0000 (18:30 +0000)]
Merge "Fixed dependency management."

9 years agoMerge "Fixed yang grouping resolution. Fixed refine parsing. Updated tests."
Giovanni Meo [Tue, 28 May 2013 18:25:37 +0000 (18:25 +0000)]
Merge "Fixed yang grouping resolution. Fixed refine parsing. Updated tests."

9 years agoMerge "Fixed whitespace for Gerrit 393"
Giovanni Meo [Tue, 28 May 2013 18:19:25 +0000 (18:19 +0000)]
Merge "Fixed whitespace for Gerrit 393"

9 years agoMerge "Fix for bug 24."
Giovanni Meo [Tue, 28 May 2013 18:18:24 +0000 (18:18 +0000)]
Merge "Fix for bug 24."

9 years agoFixed dependency management. 96/396/1
lsedlak [Tue, 28 May 2013 14:44:41 +0000 (16:44 +0200)]
Fixed dependency management.

Fixed dependency management for Binding Generator and Yang projects.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
9 years agoFixed yang grouping resolution. 95/395/2
Martin Vitez [Mon, 27 May 2013 15:10:16 +0000 (17:10 +0200)]
Fixed yang grouping resolution.
Fixed refine parsing. Updated tests.

Change-Id: I1d0b27458fde7b7b78cbaff6af210b5885493506
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoFixed whitespace for Gerrit 393 94/394/1
Ed Warnicke [Sat, 25 May 2013 17:35:39 +0000 (12:35 -0500)]
Fixed whitespace for Gerrit 393

This commit is primarily about experimenting
with commits against not yet merged Gerrits.
I took as an opportunity doing this patch to fix
some tabs and trailing whitespaces for
https://git.opendaylight.org/gerrit/#/c/393/

Change-Id: If9573cfc36c1554894854821b530443243a72070
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix for bug 24. 93/393/5
Chi-Vien Ly [Fri, 24 May 2013 23:24:55 +0000 (16:24 -0700)]
Fix for bug 24.

Description: Ping between host hosts takes more than 1second
Solution: Make modification in ArpHandler to handle the followings
- When a ARP Request is received from an host (requestor) to an unknown target host, an requestor entry is added. This will be used by ArpHandler to relay the ARP Reply back to this requestor once the target host replies.
- These target hosts  are saved and timed for up to 2sec. If the target host does not reply within up to 2sec, the host will be removed. This housekeeping process is implemented in a periodic timer task.

Change-Id: I85c6c1ef7c55845a76920ad1023b45ec6ac41974
Signed-off-by: Chi-Vien Ly <chivly@cisco.com>
9 years agoRefactored yang-model-parser-impl to improve readability. SchemaContextImpl moved... 92/392/1
Martin Vitez [Fri, 24 May 2013 15:14:33 +0000 (17:14 +0200)]
Refactored yang-model-parser-impl to improve readability. SchemaContextImpl moved to separate class. Fixed parsing of refine statement. Fixed bug in YangParser.g4 in min-elements statement.
Updated tests. Improved code generation: added import statemets to generated code.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoMerge "Statistics Northbound Test"
Giovanni Meo [Fri, 24 May 2013 09:42:32 +0000 (09:42 +0000)]
Merge "Statistics Northbound Test"

9 years agoMerge "ICMP fix and Packet class should store and provide access to the raw payload...
Giovanni Meo [Fri, 24 May 2013 09:41:16 +0000 (09:41 +0000)]
Merge "ICMP fix and Packet class should store and provide access to the raw payload in case no packet class is available to parse it."

9 years agoMerge "CodeGenerator update."
Giovanni Meo [Fri, 24 May 2013 09:34:09 +0000 (09:34 +0000)]
Merge "CodeGenerator update."

9 years agoMerge "Refactored yang-maven-plugin. Updated tests. Removed backup files."
Giovanni Meo [Fri, 24 May 2013 09:33:13 +0000 (09:33 +0000)]
Merge "Refactored yang-maven-plugin. Updated tests. Removed backup files."

9 years agoICMP fix and Packet class should store and provide access to the raw payload in case... 88/388/3
Alessandro Boch [Thu, 23 May 2013 01:01:41 +0000 (18:01 -0700)]
ICMP fix and Packet class should store and provide access to the raw payload in case no packet class is available to parse it.

- Packet to store a copy of the raw payload if no packet class is present to parse it
- Added missing code for ICMP
- Refactored PAcket, ICMP and IPv4 code
- Fixed corrupted flag setting when comparing checksum after deserializing
- Added Junit for IPv4.computeChecksum() and for serilaize/deserialize ICMP message
- Addressed some eclipse and static analysis warnings

Change-Id:If2ae95cbc3462ffcda8662e27efd9de5614872ef
Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoStatistics Northbound Test 91/391/2
Kalvin Hom [Fri, 24 May 2013 00:35:34 +0000 (17:35 -0700)]
Statistics Northbound Test

Added to stub plugin's ReadService
to return a flow for each action type

Adding additional tests for checking
that actions are being passed up
properly to the northbound

Change-Id: I01548fad2efadada3d7991616787baf6f8e9b0b8
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoCodeGenerator update. 89/389/1
Martin Vitez [Thu, 23 May 2013 15:03:50 +0000 (17:03 +0200)]
CodeGenerator update.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoRefactored yang-maven-plugin. Updated tests. 85/385/5
Martin Vitez [Wed, 22 May 2013 13:12:51 +0000 (15:12 +0200)]
Refactored yang-maven-plugin. Updated tests.
Removed backup files.

Change-Id: Ic1cd3f0cafba7c9eee2c6a39aadb77c50db88fc2
Signed-off-by: Martin Vitez <mvitez@cisco.com>
9 years agoEquals/HashCode/StringBuilder removal from Supported/PeerBandwidth 75/375/3
Ed Warnicke [Fri, 17 May 2013 15:33:10 +0000 (08:33 -0700)]
Equals/HashCode/StringBuilder removal from Supported/PeerBandwidth

Supported/PeerBandwidth does not add any new non-static members, so it should be
safe to simply fall back to the parent classes equals/hashcode.

Change-Id: I9951a7539b8371365266ac9fe49e286573748f06
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoEquals/HashCode/StringBuilder removal 74/374/3
Ed Warnicke [Fri, 17 May 2013 15:30:48 +0000 (08:30 -0700)]
Equals/HashCode/StringBuilder removal

AdvertisedBandwidth is a subclass of Bandwidth.  Bandwidth has equals/hashcode.
AsvertisedBandwidth does not add any new non-static members, so it should be
safe to simply fall back to the parent classes equals/hashcode.

Change-Id: I7da7155af144e099510f14e1db2c57f12a2cb083
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoTwo more Equals/HashCode/StringBuilder replacements 73/373/3
Ed Warnicke [Fri, 17 May 2013 15:26:09 +0000 (08:26 -0700)]
Two more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Eleventh set.

Change-Id: I45b20ae7c5d285598a1e1a0bfa9fbbfa7c1b617a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFive more Equals/HashCode/StringBuilder replacements 72/372/4
Ed Warnicke [Fri, 17 May 2013 15:12:09 +0000 (08:12 -0700)]
Five more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Tenth set.

Change-Id: I62a1b9724ed235c6b406fbbf2a005606cfd9d87e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
9 years agoFive more Equals/HashCode/StringBuilder replacements 71/371/4
Ed Warnicke [Fri, 17 May 2013 15:10:12 +0000 (08:10 -0700)]
Five more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Ninth set.

Change-Id: Icf3ea474ed0313ab92e93717658f20f6bc7c228c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFive more Equals/HashCode/StringBuilder replacements 70/370/4
Ed Warnicke [Fri, 17 May 2013 15:07:18 +0000 (08:07 -0700)]
Five more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Eighth set.

Change-Id: I47e13d6ae3ecfcb574aa33c78579271eee16b2eb
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Five more Equals/HashCode/StringBuilder replacements"
Giovanni Meo [Thu, 23 May 2013 08:25:01 +0000 (08:25 +0000)]
Merge "Five more Equals/HashCode/StringBuilder replacements"

9 years agoFive more Equals/HashCode/StringBuilder replacements 69/369/4
Ed Warnicke [Fri, 17 May 2013 15:04:23 +0000 (08:04 -0700)]
Five more Equals/HashCode/StringBuilder replacements

I'm intentionally breaking these up into small groups so they can
be reasonably reviewed, rather than one giant group that can't.
Contributes to fixing bug 20.

Seventh set.

Fixed to no longer use NodeIDString in Node or NodeConnectorIDString in
NodeConnector when computing equality or hashcode.

Change-Id: Ic433f705cb27c6454ab06e897ede6715fcf5a5a2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoEnable multiple roles per user (backend) 81/381/2
Alessandro Boch [Wed, 22 May 2013 00:54:03 +0000 (17:54 -0700)]
Enable multiple roles per user (backend)

Signed-off-by: Alessandro Boch <aboch@cisco.com>
9 years agoNorthbound IntegrationTest 77/377/3
Kalvin Hom [Tue, 21 May 2013 01:48:28 +0000 (18:48 -0700)]
Northbound IntegrationTest

Initial base for writing integration
tests for northbound bundles.

All northbound integration tests can be
done within this bundle.  A full controller
using the stub protocol plugin will be started.

A test for getting all flow statistics is also
done.

Change-Id: Ife16e2fb81a2fe223813473fdd83402385fc59ba
Signed-off-by: Kalvin Hom <kahom@cisco.com>
9 years agoplugin-stub: InventoryService to Stub 76/376/2
Kalvin Hom [Mon, 20 May 2013 22:45:11 +0000 (15:45 -0700)]
plugin-stub: InventoryService to Stub

Changing the InventoryService to use the
node STUB type instead of OF.  Changed the
SwitchManagerIntegrationTest to match the
stub type changes.

Change-Id: I1a508bb8893c0f7f655a0270234aeeb13cf644b3
Signed-off-by: Kalvin Hom <kahom@cisco.com>