Dave Tucker [Thu, 19 Jun 2014 01:37:42 +0000 (02:37 +0100)]
Add schema version to DatabaseSchema
This commit also adds a Version class to lib.notation that allows
versions to be compared. This is necessary for adding fromVersion
and toVersion to the TypedTable and TypedClass annotations
Change-Id: I30c821cd570a6b78e6eee874dafff269399a7120
Signed-off-by: Dave Tucker <djt@redhat.com>
Madhu Venugopal [Wed, 18 Jun 2014 05:41:47 +0000 (22:41 -0700)]
Added proper Typed Schema Wrapper infra to Library which enables a simple mechanism to introduce any Schema specific Java Objects.
* Added ovsdb.lib.schema.typed package with infra classes that supports this functionality.
* TyperUtils.java uses Reflection to provide the required Wrapper functionality with the help of Java annotations (TypedTable & TypedColumn)
* MethodType option of TypedColumn is modified to support GETCOLUMN in addition to GETDATA and SETDATA method types
* Changed the existing Typed IT code and introduced TestBridge.java (Bridge Table of ovs-vswitchd schema)
Change-Id: Ica6d14474ccecfd38fd025f7d5911b951312e9f7
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 16 Jun 2014 23:07:37 +0000 (16:07 -0700)]
Merge remote-tracking branch 'origin/master' into merge-branch
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Conflicts:
.gitignore
distribution/opendaylight/pom.xml
neutron/pom.xml
neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13ProviderManager.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/ProviderNetworkManager.java
northbound/pom.xml
ovsdb/pom.xml
ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryIT.java
ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
plugin/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java
Change-Id: Ib84968636e29a86a2308c112f251e7b5fd0ab0dc
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Sun, 15 Jun 2014 06:40:33 +0000 (23:40 -0700)]
Removed the ovsdb subdirectory properly in lieu of the upcoming rebase with master
Change-Id: I01b52f4feae383daf9bfe8ffc2cf2603d9e5f875
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Sun, 15 Jun 2014 04:27:23 +0000 (21:27 -0700)]
Fixed the broken Typed IT tests & included it to run as part of failsafe maven plugin.
Change-Id: I269c200646b83c336b253d2dfa9a089e0e0595eb
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Sat, 14 Jun 2014 14:24:22 +0000 (07:24 -0700)]
Moved the code to normalize the java objects (Set and Map) to OVSDB json friendly format into ColumnSchema class
Change-Id: Ia04cdc74dd5733df187ea1e7a9b99952f9566a3d
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Fri, 13 Jun 2014 13:53:15 +0000 (06:53 -0700)]
Added safety check for a case in which getSchema may not report a "hidden" Column, but Monitor respond with data for that "hidden" column.
Change-Id: I21e5e9c48985ff4a79b6beecbc88891d1c83a831
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Fri, 13 Jun 2014 13:29:47 +0000 (06:29 -0700)]
Adding support for Unfiltered Monitoring
RFC 7047 supports unfiltered monitoring, wherein an application can send a Table Monitor request without specifying any
Columns to filter upon. OVSDB server will respond with TableUpdate for the requested table with data from all of its
columns (except _uuid).
In order to add this support, changes were made to MonitorRequest with an option of keeping its "columns" member as null.
Jackson serialization will ignore any member with a null value which will aid in the unfiltered monitor request.
Tests were added to cover this case as well.
Also thanks to this IT test, an existing bug is unearthed wherein the special column name was "_version" instead of "version".
Change-Id: I8e43624b09a2bf38a8846bd33ed1b493c14695ee
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Fri, 13 Jun 2014 06:52:29 +0000 (23:52 -0700)]
Fixed Mutate operation to handle MultiValued {Key, Value} ColumnType.
Change-Id: I56d1ca186c7f6907d5a93bd47a8fc06db2310762
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Fri, 13 Jun 2014 06:11:47 +0000 (23:11 -0700)]
Resolved the Serialization and Deserialization issues for MultiValued Columns with the specialized "set" and "map" indicators.
Fixed various classes where the KeyValue ColumnType is not handled.
Also added IT tests to cover both Serialization and Deserialization aspects of KeyValue ColumntType by using the external_ids column of Bridge table.
Change-Id: I067bba372da8c02b0befbdb5210dda9068ea397f
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Thu, 12 Jun 2014 07:59:42 +0000 (00:59 -0700)]
Modified the Library to be more friendlier towards the uuid value obtained through Table updates and the _uuid column.
This change involves the following :
- Populated columnschema for internally generated columns(_uuid and version) by default to the TableSchema (Refer RFC 7047 section 3.2)
- Added "uuid" field in TableUpdate, without which the applications were unable to get the Row identifier
- Moved the generic Object in OperationResult to Row<GenericTableSchema>. But this change alone is not enough to make Select operation
work as expected. We need a more richer way to populate the "columns" in Row class during the Select response (Bug 1190)
- Modified OvsDBClientTestIT.java to use the uuid column obtained from open_vSwitch monitor in order to insert and delete Bridges during
add and delete operation (Note that the current IT code updates the open_vSwitch row without this where clause).
Change-Id: Ie0a58c6e45be72993a52a93d8c4374eda72fe687
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Thu, 12 Jun 2014 05:54:54 +0000 (22:54 -0700)]
Addressing review comments for 7920
Changes include :
- Changes variable name from tval to untypedValue in Insert and Mutate classes
- Fixed most of the review comments in the IT
Change-Id: I83197b63aa2874f0c7136ec4dc3b7b629b2407a7
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Wed, 11 Jun 2014 21:44:13 +0000 (14:44 -0700)]
Fixed the Basic Bridge create Integration Test by performing mutate on OpenVSwitch Table.
Also added
- Fixed a multiValue bug in Mutate
- the cleanup @After method to delete the created br-test
- few global variables that can be reused across test and cleanup (such as BridgeUuid)
- Fixed a Compiler warning in Insert
Change-Id: I091d7fa7b59d36718d9cca42cc8669a73461a764
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 10 Jun 2014 21:15:13 +0000 (21:15 +0000)]
Merge "explicitly parsing JsonNode for updates" into topic/schema
Brent Salisbury [Tue, 10 Jun 2014 19:34:41 +0000 (19:34 +0000)]
Merge "Adding Pax-Exam infra with a basic IT for plugin"
Ashwin Raveendran [Sat, 24 May 2014 22:37:05 +0000 (15:37 -0700)]
explicitly parsing JsonNode for updates
Change-Id: Ib9f420c9f9d8eb11d459e3fc903b7280fa1431cb
Signed-off-by: Ashwin Raveendran <ashw7n@gmail.com>
Madhu Venugopal [Fri, 6 Jun 2014 10:09:55 +0000 (03:09 -0700)]
Adding Pax-Exam infra with a basic IT for plugin
Change-Id: I4bdfdda16e81d539c002f683066238ada2355f27
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Thomas Bachman [Thu, 5 Jun 2014 14:30:36 +0000 (14:30 +0000)]
BUG-1147: Fix programming of NORMAL flow entry when using OF 1.3 Provider.
The OVSDB Plugin programs the br-int and br-ex bridges with the appropriate
flows as they are discovered by the plugin. The OpenFlow 1.0 provider
correctly installs the LLDP and NORMAL flows, but the OpenFlow 1.3 provider
does not install the NORMAL flow on the br-ex bridge (note: the NORMAL flows
are only installed on br-ex bridges, and not br-int bridges, when using
OpenFlow 1.3).
This patch fixes this by programming of the NORMAL flow on br-ex
bridges when using the OpenFlow 1.3 provider.`
Change-Id: I32e5179cc94ca7afb513a5a6fb6bc6c6dc5cf84d
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
Madhu Venugopal [Wed, 4 Jun 2014 05:08:00 +0000 (05:08 +0000)]
Merge "Add unit test for JsonRpcDecoder" into topic/schema
Dave Tucker [Tue, 3 Jun 2014 17:59:24 +0000 (18:59 +0100)]
Add unit test for JsonRpcDecoder
Change-Id: Ia4bb681814fa3dc7a1b79ccb6131080d292c0484
Signed-off-by: Dave Tucker <djt@redhat.com>
Brent Salisbury [Sat, 17 May 2014 22:39:35 +0000 (18:39 -0400)]
BugFix #958 in OVSDB setting LLDP length to 0xffff
Patch4: rebase
Patch3: Setting the max length to the max value
to prevent truncation of the packets. The default
contrustor was (0). Packets are no longer being
truncated now.
-For the commentors here is the output of removing
maxlength():
-----------
OFPT_PACKET_IN (OF1.3) (xid=0x0): total_len=89
in_port=1 tun_src=172.16.86.129
tun_dst=172.16.86.128 (via action) data_len=0
(unbuffered) (***total_len != data_len***)
-With output.setMaxLength(0xffff); at max val
output is as follows:
--------------------
OFPT_PACKET_IN (OF1.3) (xid=0x0): total_len=90
in_port=LOCAL (via no_match) data_len=90
buffer=0x00000101
Patch2:
Pulling the max_len all together should solve
the truncating issue. Hard to tell as only half of
the flowmods are getting installed at the moment
and this creates lots of deserialization errors
from some IPv6 punts. It doesnt solve the issues
in the Neutron plugin at the moment. The original
error doesnt appear for me outside of OVS logs. There
isnt a need to send any packet payload which is what
the max_length field is for per the spec. I was thining
zero would send the whole payload but per the spec
and thought ofprovider had a good reason to use 40bits
but not so much. Will add comments there.
/*
From of1.3 spec section A.2.5
"The max_len indicates the maximum amount of data from
a packet that should be sent when the port is
OFPP_CONTROLLER. If max_len is zero, the switch must
send zero bytes of the packet. A max_len of
OFPCML_NO_BUFFER means that the complete packet
should be sent, and it should not be buffered."
*/
Change-Id: Ifcbe22e38d599096a2e451144b461e128a41ee08
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Madhu Venugopal [Wed, 28 May 2014 22:26:27 +0000 (15:26 -0700)]
Removing the Open_vSwitch schema hardcoding in OvsDBClient.
Though it is an harmless constant string, it goes against the motivation of the library redesign to be
schema independent. Hence moving the schema string to a more appropriate place (to the applications),
in this case, to the Integration Test files.
Also, modified the initialize functionality to include a test to check for the list_dbs to contain Open_vSwitch
schema as all the tests in this file are based on Open_vSwitch schema tables.
Change-Id: I3210abf1fa18b5707a27b719f7d481b5de76d6be
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 27 May 2014 21:00:01 +0000 (21:00 +0000)]
Merge "Added Mutate operation" into topic/schema
Matt Oswalt [Tue, 27 May 2014 20:56:53 +0000 (16:56 -0400)]
Added Mutate operation
Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>
Madhu Venugopal [Tue, 27 May 2014 15:49:43 +0000 (15:49 +0000)]
Merge "Adding neutron api v2.0 security group/rules handlers"
Brent Salisbury [Fri, 23 May 2014 18:33:50 +0000 (14:33 -0400)]
Adding neutron api v2.0 security group/rules handlers
Patch3:
-Verified with merged patches and rolled back
whitespace formatting on Activator and Tenantmanager.
-Removed the comments Sam wanted removed.
-Only dependancy is commit 7410 that registers
the service in networkconfig.neutron.
https://git.opendaylight.org/gerrit/#/c/7410/
Patch2: Pulled the TenantManager adds since it was just
for a usage preview. Added NeutronPortSecurityHandler
parent handler for NeutronSecurityGroup and
NeutronSecurityRule. Still depends on NBAPI merges and
OF merges.
Change-Id: Idbdfcd4e0accba1f98951d052318a1aba9a337f8
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Brent Salisbury [Mon, 26 May 2014 22:14:18 +0000 (18:14 -0400)]
Sample OpenStack/Neutron v2.0 Postman API Collection
-Example v2.0 NBAPI Neutron calls to import into Postman
for development testing. All calls are either implemented
or pending merges.
-OpenStack Neutron v2.0 API reference:
https://wiki.openstack.org/wiki/Neutron/APIv2-specification
Change-Id: Ifd1bbc8b77579c8af67dd33bb6f55303a34c16fb
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Madhu Venugopal [Mon, 26 May 2014 18:16:13 +0000 (11:16 -0700)]
Added assert operation as per RFC 7047 section 5.2.10
Change-Id: I31087a39bffc1f395652f0132fb5881cc45f8554
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 26 May 2014 17:30:08 +0000 (10:30 -0700)]
Added Comment operation as per RFC7047 section 5.2.9
Change-Id: I4adf77cf3823683c63a324a9ba690f99dc33e1fa
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 26 May 2014 17:24:29 +0000 (10:24 -0700)]
Fixed a bug introduced due to a recent commit. Thanks to Integration tests, we were able to identify the issue.
We need to add good Asserts to catch and Fail Verify and Merge jobs. That will prevent from these happening.
We are waiting on the Mutate operation to et merged before we could write better Asserts.
Change-Id: I62e42c27032b8502937394d50934c2cf4038eed9
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Sat, 24 May 2014 14:54:32 +0000 (14:54 +0000)]
Merge "Add unit tests for getPhysicalInterfaceName"
Ashwin Raveendran [Fri, 23 May 2014 01:12:02 +0000 (18:12 -0700)]
renamed old package to temp and fixes for min/max
Renamed the old package for TableUpdates to temp and have a newer one that
can be enhanced for the current use caes while slowly deprecating the old
one. Also fixes a bug and added support for Set based field
Change-Id: If36c9c143eff2a8cc0cd1a0af5f1572ce1dbced5
Signed-off-by: Ashwin Raveendran <ashw7n@gmail.com>
Madhu Venugopal [Thu, 22 May 2014 22:50:48 +0000 (22:50 +0000)]
Merge "getPhysicalInterfaceName not finding match in some cases"
Sam Hague [Thu, 22 May 2014 21:34:23 +0000 (17:34 -0400)]
Add unit tests for getPhysicalInterfaceName
Change-Id: I616dcc2f8c06db7c33246ee84478fd3eb70a4b42
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Thu, 22 May 2014 21:13:40 +0000 (17:13 -0400)]
getPhysicalInterfaceName not finding match in some cases
Cases where there are multiple Open_vSwitch rows would cause
the method to not find a match. The method should loop through
all the rows until a match is found, but an early break was causing
the method to exit after the first row is processed.
Change-Id: I624bbd2aeede7c99bad62d1c5356bcf2af1dd0c8
Signed-off-by: Sam Hague <shague@redhat.com>
Madhu Venugopal [Thu, 22 May 2014 14:16:25 +0000 (07:16 -0700)]
Added a test-case to include non-atomic column to test the ser/de-ser pipeline in the new schema base code.
Please note that, this is added to make sure we will replace the ugliness of OvsDBSet/OvsDBMap from the Client
facing API towards internals.
Change-Id: I3d798816e697f53af3f07b504ad06715e5ab7393
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Thu, 22 May 2014 13:48:23 +0000 (13:48 +0000)]
Merge "Stop isReady method always returning true" into topic/schema
Dave Tucker [Fri, 16 May 2014 17:24:54 +0000 (18:24 +0100)]
Stop isReady method always returning true
The OvsdbClientImpl.isReady() method will always return true as the
schema variable is initialized when the class is created and an
instance of a list can never be null.
This commit implements the timeout in the ToDo and changes the logic
to check if the schema.isEmpty
Change-Id: I1d48fa56f5a93e227fc3b623d3405d07a1751972
Signed-off-by: Dave Tucker <djt@redhat.com>
Giovanni Meo [Thu, 22 May 2014 13:38:54 +0000 (15:38 +0200)]
ovsdb has a dependency on artifacts from integration project, that shall be removed
- ovsdb has a dependency on artifact from integration project, while
integration project depends on ovsdb. This is a circular dependency
for the release process because we cannot release OVSDB without
releasing INTEGRATION and viceversa. To break the circular dependency
i'm proposing to build the ovsdb distribution starting from the
controller one adding the few deltas needed. Yes this cause some
duplication but i couldn't find a better way to break it. Suggestions
are more then welcome!
Change-Id: Ifed07caddce549a96a7f6eb92d6c977f2f938d5c
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
Madhu Venugopal [Thu, 22 May 2014 13:17:34 +0000 (13:17 +0000)]
Merge "Add OVSDB Select Operation" into topic/schema
Dave Tucker [Sat, 10 May 2014 18:08:00 +0000 (19:08 +0100)]
Add OVSDB Select Operation
Add the OVSDB Select Operation to the new OVSDB Library
Change-Id: Ie59033a7628f02e85bc3babba56c5723406398d0
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Dave Tucker [Wed, 21 May 2014 14:03:10 +0000 (15:03 +0100)]
Update .gitreview to use topic/schema branch
`git review` will push to topic/schema by default.
Change-Id: I8cebaa5344202495894441bf4973fac6fe0c23ca
Signed-off-by: Dave Tucker <djt@redhat.com>
Brent Salisbury [Wed, 21 May 2014 17:52:54 +0000 (17:52 +0000)]
Merge "Abort operation as per Section 5.2.8 of RFC 7047" into topic/schema
Brent Salisbury [Wed, 21 May 2014 17:50:39 +0000 (17:50 +0000)]
Merge changes Idd1bb88c,I9fd5ef99 into topic/schema
* changes:
Fixed a bug in where condition usage in Update & Delete operations. Also moved Delete operation to a seperate transaction in the Test code to test multiple transactions.
Commit operation as per Section 5.2.7 of RFC 7047
Brent Salisbury [Wed, 21 May 2014 17:44:04 +0000 (17:44 +0000)]
Merge "Cleaned up Integration Test setup" into topic/schema
Madhu Venugopal [Wed, 21 May 2014 13:25:02 +0000 (06:25 -0700)]
Abort operation as per Section 5.2.8 of RFC 7047
Change-Id: I74dd7e09b4ffc3a44e9876570e004c6637a6666f
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Wed, 21 May 2014 13:05:43 +0000 (06:05 -0700)]
Fixed a bug in where condition usage in Update & Delete operations.
Also moved Delete operation to a seperate transaction in the Test code to test multiple transactions.
Change-Id: Idd1bb88ccbda75047c83d8e825992f8ee6aad881
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Wed, 21 May 2014 12:51:44 +0000 (05:51 -0700)]
Commit operation as per Section 5.2.7 of RFC 7047
Change-Id: I9fd5ef994163549ea18e1fee7979c3105e8eb5f8
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 20 May 2014 05:42:55 +0000 (22:42 -0700)]
Cleaned up Integration Test setup
1. Removed integration-test.properties from library and plugins
2. Removed unused json files from plugins.
3. Fixed all the places where some random default ipaddress / port is used
4. Forcing inclusion of ovsdbserver.ipaddress System Property when running integration Tests by an AssertFail.
5. Fixed a bug in OvsdbTestDeletePortIT
Change-Id: Icf5990fb11f66c90c0ec9c8cb30af8907ab121e6
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Dave Tucker [Sat, 10 May 2014 17:42:28 +0000 (18:42 +0100)]
Replace literal for Update operation with constant
The update class uses a literal for the operation name.
Replace this with a constant to be consistent with other operations
Change-Id: I3512bedd5badf2b86e36619b859a6e0c53201761
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Madhu Venugopal [Tue, 20 May 2014 01:42:49 +0000 (01:42 +0000)]
Merge "Fix bug 1028: Don't ignore exception in prepareInternalNetwork"
Hsin-Yi Shen [Thu, 17 Apr 2014 18:13:04 +0000 (14:13 -0400)]
Add ovsdb vlan support by using OF1.3
This change is to support vlan tenant isolation using OF1.3
This is using OF1.3 and Sam has the 1.0 change.
The changes of common neutron files are committed by Sam.
Most of the change here is for OF1.3 only.
This commit also has dependency on BUG 1020 "Multiple output actions is not allowed in the action list of apply-action instruction". The vlan and tunnel broadcast is broken due to BUG1020.
We don't want BUG 1020 to block the vlan feature commit and send this change for code review now.
Onve BUG 1020 is fixed, broadcast should work properly.
Change-Id: Ibd16404212cc1c4de21921477e4d1cf335a12b39
Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
Dave Tucker [Tue, 1 Apr 2014 15:52:21 +0000 (16:52 +0100)]
Use Felix DM for OVSDB Neutron Services
The ovsdb.neutron bundle has serveral services currently implemented as
singletons. This makes these classes difficult to test and also creates
a hard coded dependency. We can use the Felix DM provided by the OSGi
container to implement dependency injection for these services.
Fixes bug 1030
Change-Id: Ia0dca98302e3f0b6745c1687db9f0717c2b6b558
Signed-off-by: Dave Tucker <djt@redhat.com>
Dave Tucker [Sun, 18 May 2014 10:24:14 +0000 (11:24 +0100)]
Fix bug 1028: Don't ignore exception in prepareInternalNetwork
As detailed in bug 1028, don't ignore the exception from
createIntegrationBridge as calling initializeFlowRules will fail.
Change-Id: Id0af4621667ac47d7f411645ea4df0d99f8d00cf
Signed-off-by: Dave Tucker <djt@redhat.com>
Dave Tucker [Fri, 9 May 2014 21:56:52 +0000 (22:56 +0100)]
Add the OVSDB Delete Operation
Add the OVSDB Delete Operation to the new library
Change-Id: Ie16c193cca74184e79f1e8462dcc11bf8632a9d4
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Thomas Bachman [Fri, 16 May 2014 06:53:06 +0000 (06:53 +0000)]
Script support for DevStack Configuration.
Addition of several scripts that are helpful for DevStack
environment setup.
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
Change-Id: Ibe87275fed5199557996b3de4e3d30ade7f523e1
Madhu Venugopal [Thu, 15 May 2014 21:37:27 +0000 (14:37 -0700)]
Moving ipfix column to set<UUID> in Bridge table.
Please note that these fixes to the fixed tables will all be deprecated once the topic/schema
branch is collapsed into the master. These fixes are encouraged into the master only to support
existing users. That is the only reason we are not spending time with UT/IT scripts for these.
Change-Id: I48603ac3b204d4fde676100e95edcd02761d7586
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Dave Tucker [Wed, 14 May 2014 19:44:25 +0000 (20:44 +0100)]
Remove com.google.inject from neutron/pom.xml
This sneaked in when I was testing out com.google.inject.
Unfortunately it causes errors when starting OSGi. Ooops!
Change-Id: Ic325d51008714f4d6b4d0d13a37db8c6977d5246
Signed-off-by: Dave Tucker <djt@redhat.com>
Madhu Venugopal [Wed, 14 May 2014 18:48:59 +0000 (18:48 +0000)]
Merge "Add Vagrantfile for OVSDB Test/Dev environment"
Madhu Venugopal [Wed, 14 May 2014 16:42:03 +0000 (16:42 +0000)]
Merge "Add License to OVSDB Repo"
Dave Tucker [Tue, 13 May 2014 08:45:30 +0000 (09:45 +0100)]
Update OVSDB Pom files for sortpom plugin
Auto-sorting of pom files was introduced in
https://git.opendaylight.org/gerrit/#/c/6247/
As the OVSDB pom's are children they too must be auto-sorted.
`mvn clean install` was used to sort the poms for this commit.
Change-Id: I2cb85c092452c94018334271bc37b4bc474d6e97
Signed-off-by: Dave Tucker <djt@redhat.com>
Dave Tucker [Tue, 13 May 2014 03:08:20 +0000 (04:08 +0100)]
Add License to OVSDB Repo
OVSDB doesn't have the full text of the EPL in the base of the repo.
Other projects (controller, vtn etc...) do. This commit adds the
license.
Change-Id: I0adb2f0d8726fda718d285e596dd2ab3f51329fc
Signed-off-by: Dave Tucker <djt@redhat.com>
Dave Tucker [Tue, 8 Apr 2014 19:40:05 +0000 (20:40 +0100)]
Add Vagrantfile for OVSDB Test/Dev environment
This commit adds a Vagrantfile to the root of the repository. This
allows a developer to issue a single command to pull up a development
and test environment:
vagrant up
This will create 3 x VMs in Virtual Box. VMs can be
created individually if required.
1 x VM for Mininet - 2GB RAM
1 x DevStack Control/Compute node - 4GB RAM
1 x DevStack Compute node) - 4GB RAM
See README.Vagrant for full instructions
Change-Id: Ieaaec6cde09ce9ecc7b31861f86695c662849f7d
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Madhu Venugopal [Sat, 10 May 2014 22:08:44 +0000 (22:08 +0000)]
Merge "Fix unhandled timeout in OVSDBNettyFactoryIT"
Dave Tucker [Sat, 10 May 2014 02:01:03 +0000 (03:01 +0100)]
Fix unhandled timeout in OVSDBNettyFactoryIT
The IT sometimes hangs when run due to a timeout in getting the schema.
Limit connection attemtps to 3 seconds with 3 retries.
This does not fix the root cause, but *does* fail the IT.
Change-Id: Ie209fb5cadadd832991dc406133b96e291d38369
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Madhu Venugopal [Sat, 10 May 2014 13:52:46 +0000 (13:52 +0000)]
Merge "Update netty to 4.0.17"
Dave Tucker [Fri, 9 May 2014 20:55:53 +0000 (21:55 +0100)]
Replace String Literals in ITs with constants
Code cleanup.
Replace String literals in Integration Tests with contants.
Change-Id: Ib5d2d181edb3b4b2f47be67778aadcb843d2f8f8
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Dave Tucker [Fri, 9 May 2014 19:29:10 +0000 (20:29 +0100)]
Fix failure of OvsdbTestGetBridgeDomainsIT
OvsdbTestGetBridgeDomainsIT was failing due to a NullPointer to the
ConfigurationService.invetoryServiceInternal
- Add InvetoryService to TestObjects
- Call setInventoryServiceInternal on the ConfigurationService
Change-Id: I1ec373df3b2726aca613ee740b4768bc9d28954e
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Dave Tucker [Fri, 9 May 2014 18:52:40 +0000 (19:52 +0100)]
Fix integration tests
Fix hardcoded values and connection issue in OVSDB IT
Change-Id: I79f5fd44f3fa4ee86634a8b979b9bcb7e4fba030
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Madhu Venugopal [Wed, 7 May 2014 04:07:31 +0000 (21:07 -0700)]
Fixed distribution build parameters to pull in the Virtualization edition from Integration branch
and replace it with the latest OVSDB bundles (ovsdb library, northbound and neutron).
This makes the OVSDB developers life simpler and avoids all the copy the bundle over issues and
provides a much simpler way to execute the controller with the OVSDB bundles being developed.
Run the controller normally :
run.sh -Xmx2048m -XX:MaxPermSize=512m -virt ovsdb [-of13]
Change-Id: Icd717639ca1768a87feefe550a2c1ac386359156
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 6 May 2014 22:57:17 +0000 (15:57 -0700)]
Removed all the static string usage for network types vxlan, gre, vlan and replaced it with a constant.
Change-Id: Ied4b930959ad202f8e2428b839350a7d777b4adc
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Sam Hague [Tue, 6 May 2014 21:45:56 +0000 (17:45 -0400)]
Add support for vlan tenant isolation to ovsdb using OpenFlow 1.0.
This is an initial push of the changes needed to support vlan tenant isolation.
Ignore the logger's with shague in them since they are for my debugging and will go away.
This is using OF 1.0. Hsin-Yi has the 1.3 task.
The br-eth for vlan and br-tun for tunnels has been combined to br-net. A single patch port
connects br-net to br-int.
Functions to parse the physical interface name from the provider_mappings have been added.
Signed-off-by: Sam Hague <shague@redhat.com>
Change-Id: I369165f4f92665242e033454b49a5ee6a4ea0381
Hsin-Yi Shen [Mon, 5 May 2014 23:55:34 +0000 (19:55 -0400)]
BUG-954: Add support for Neutron port/network delete events for OF1.3
This commit will enable support for Neutron port delete and network delete events.
It will also enable flow cleanup and tunnel port delete for ovsdb using OF 1.3
Signed-off-by: Hsin-Yi Shen <hshen@redhat.com>
Change-Id: Ic848125d21abc44c796ef2b1675cca9e50630f76
Robert Varga [Thu, 27 Mar 2014 16:17:33 +0000 (17:17 +0100)]
Update netty to 4.0.17
This is a follow-up for https://git.opendaylight.org/gerrit/#/c/5630/ .
Signed-off-by: Robert Varga <rovarga@cisco.com>
Ashwin Raveendran [Sat, 19 Apr 2014 17:09:40 +0000 (10:09 -0700)]
Implementation for Monitor operation
Change-Id: I558099303c306d244a52fb2117e825c282609f3a
Signed-off-by: Ashwin Raveendran <ashw7n@gmail.com>
Flavio Fernandes [Thu, 24 Apr 2014 11:22:29 +0000 (07:22 -0400)]
Turn hard coded localhost:8080 into templates in the postman_collection files.
Change-Id: Ic3620230e29d278d234a3ba9fea53da8f6ab5c8c
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Madhu Venugopal [Fri, 18 Apr 2014 14:47:36 +0000 (07:47 -0700)]
Code ReOrganization and Re-Architecture changes
1. Split OVSDB library from plugin
2. Removed all Opendaylight dependencies from OVSDB library
3. Modified the library to take in context vars to retain consistency with the current design.
4. Changed the artifact-id of all the bundles from random conventions to a consistent convention "ovsdb_*"
5. Also changed the directory structure to fit in the reorg/rearch.
Change-Id: Iea0bc8b24c398f0de861a64ddceafe49593aefdb
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 8 Apr 2014 12:03:38 +0000 (05:03 -0700)]
Added more ignorable files to .gitignore
Change-Id: I0d91d3a6f803a1489d8d14db12b6e4e4da2f4e23
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 8 Apr 2014 11:34:17 +0000 (04:34 -0700)]
interface declaration for missing ovsdb operations
Fixing Merge-Conflicts manually as the Automatic Rebase failed.
Change-Id: I2b22210c55fb96da6f393e440666f247a97c5aca
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Ashwin Raveendran [Fri, 4 Apr 2014 01:21:42 +0000 (18:21 -0700)]
Refactoring for better package organization and other changes.
The main interface is renamed to OvsDBClient to represent the library's
intention of being used against any OVS capable device. Fixed methods
to be all asynchronous.
Change-Id: I9d6e0c8cc53e0bcf188d572c655c7a28e3e0dae2
Signed-off-by: Ashwin Raveendran <ashw7n@gmail.com>
Brent Salisbury [Mon, 7 Apr 2014 00:26:09 +0000 (20:26 -0400)]
Patched some existing and added IPFIX to Postman API Collection.
Changes:
-------
Added:
IPFIX API Calls:
Modified/Patched:
SFlow
Queue
NetFlow
Controller
Manager
For version tracking I opened Bugzilla ID 667
https://bugs.opendaylight.org/show_bug.cgi?id=667
Change-Id: I3ccdf12463b25f766254c3fa0058753584caf3b5
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Ashwin Raveendran [Tue, 1 Apr 2014 21:43:00 +0000 (21:43 +0000)]
Merge "Add helper methods to meta/*Schema classes" into topic/schema
Dave Tucker [Tue, 1 Apr 2014 14:39:09 +0000 (15:39 +0100)]
Add helper methods to meta/*Schema classes
Add the following helper methods to make error and type checking easier.
DatabaseSchema.getTables() - gets a List<String> of tables
DatabaseSchema.hasTable(String table) - returns true if the table exists
DatabaseSchema.getTable(String table) - returns the TableSchema object
TableSchema.getColumns() - gets a List<String> of columns
TableSchema.hasColumn(String column) - returns true if the column exists
TableSchema.getColumn(String column) - returns the ColumnSchema object
TableSchema.getColumnType(String column) - returns the ColumnType object
for the specified column
These calls are intended to be used for error/type checks. For example:
if (!device.hasTable("Open_vSwitch") {
throw RuntimeException("This is not the vswitchd schema")
}
Change-Id: If9dd286c05a38d7f60a0ce63cd3148157e3b345e
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
Dave Tucker [Tue, 1 Apr 2014 14:02:53 +0000 (15:02 +0100)]
Add license info to new files
Change-Id: I175d777952cac6109dfd838d3938446f241ea8e6
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
Madhu Venugopal [Tue, 1 Apr 2014 11:31:49 +0000 (04:31 -0700)]
Bump up the bundle versions for the bundles based on Semantic Versioning.
Since we are performing major rearchitecture of the base OVSDB library and it results in backward incompatible
API changes, the MAJOR version is bumped up. But the neutron and northbound bundles will face functionality impact
but not API impact & hence only the MINOR version is bumped up.
Care must be taken to make sure the master and topic/schema branche versions dont step on each oth versions.
It causes CI headaches.
Change-Id: Ib1b1810c54695e8e59917928e62cda43907a7af6
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Tue, 1 Apr 2014 11:30:36 +0000 (11:30 +0000)]
Merge "Add build script in OVSDB resources"
Madhu Venugopal [Mon, 31 Mar 2014 23:53:27 +0000 (16:53 -0700)]
Fixing checkstyle issues on Ashwin's initial POC code for the new Schema design.
Change-Id: I1c97d60c272e47be165f6f562db7ea2122e2d438
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 31 Mar 2014 22:17:59 +0000 (15:17 -0700)]
Fixing a few issues in PatchSet-1 that adds support for IPFIX table in ConfigurationService.
Change-Id: I28b0ca6daecc6ea6244c91137fba2e16b9444e78
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Dave Tucker [Sun, 23 Mar 2014 22:52:51 +0000 (22:52 +0000)]
Add build script in OVSDB resources
The script in this commit simplifies the build process of the OVSDB
project.
usage: ovsdb-build [-h] [-r] [-b] [-of13] [-v] [-g CHANGE_ID] [-start]
[-stop]
[-d DIRECTORY] [-t]
optional arguments:
-h, --help show this help message and exit
-r, --reclone Reclone the Controller/OVSDB repos
-b, --rebuild Build the Controller Project
-of13, --openflow13 Enable OpenFlow 1.3 Support
-v, --verbose Verbose output
-g CHANGE_ID, --gerrit CHANGE_ID
Gerrit Change ID
-start, --start Start the controller
-stop, --stop Stop the controller
-d DIRECTORY, --directory DIRECTORY
directory
-t, --tmux Create tmux session
On first run it is recommended to run the following:
./ovsdb-build -r -b -start
You can add the `-d` option to specify the directory you want to build
in:
./ovsdb-build -r -b -d /home/dave/dev/opendaylight -start
This will clone the controller and ovsdb projects, build them, move the
ovsdb artifacts in to the controller directory and start the controller.
Gerrit Changes can be built and loaded to the controller with a single
command:
./ovsbd-build -g 5716 -start
The controller is started in the background. To access the OSGi ole
you can manually `telnet 127.0.0.1 2400` or you can add `-t` to let
the build script create a tmux session for you.
Change-Id: Ie98942843a90193a38e17e4a8cd09b2806942e5c
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
Madhu Venugopal [Sun, 23 Mar 2014 16:05:24 +0000 (16:05 +0000)]
Merge "Adding support for the git-review command line tool"
Madhu Venugopal [Mon, 17 Mar 2014 22:25:30 +0000 (15:25 -0700)]
Updating ovsdb dependencies to the LATEST SNAPSHOT in Controller & Yangtools project
After the Hydrogen Release, we decided to keep the inter-project dependencies only with the RELEASE version of the bundles.
But, Since the weekly release schedule is not ratified and actual SNAPSHOT dependencies are growing, we dont have much choice
other than to depend on the SNAPSHOT versions of the bundles.
Once we have a streamlined process for weekly RELEASE in place, we can change our strategy to depend only on the RELEASE bundles.
Till then, we have to depend on SNAPSHOTs to make progress.
Change-Id: I68ee36c6ff418b20e3a7a255b6604246b2567aef
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Dave Tucker [Tue, 4 Mar 2014 15:29:34 +0000 (15:29 +0000)]
Update Enunciate Documentation for OVSDB REST API
Change-Id: Ia77888f75343075710de2c1522cbd048bd609543
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
Hideyuki Tai [Thu, 20 Feb 2014 13:03:23 +0000 (08:03 -0500)]
Removed convertNeutronIDToKey(String) calls.
The convertNeutronIDToKey(String) method of BaseHandler class converts
Neutron ID.
Because PortHandler class just uses Neutron ID for log output, it does
not need to use convertNeutronIDToKey(String).
Change-Id: I025b1db5cdc0c635a75a286f6eeb961c5233f7fa
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
Hideyuki Tai [Thu, 20 Feb 2014 11:52:41 +0000 (06:52 -0500)]
Fixed typo in PortHandler.java.
Change-Id: I85204b6abccba995caf8258db2227d2c488713c7
Signed-off-by: Hideyuki Tai <h-tai@cd.jp.nec.com>
Jenkins ovsdb silo [Mon, 27 Jan 2014 23:16:57 +0000 (23:16 +0000)]
[maven-release-plugin] prepare for next development iteration
Jenkins ovsdb silo [Mon, 27 Jan 2014 23:16:56 +0000 (23:16 +0000)]
[maven-release-plugin] prepare release master-tagforprepareonly-ovsdb-bulk-release-2-1
Madhu Venugopal [Mon, 27 Jan 2014 22:52:11 +0000 (14:52 -0800)]
Adding commons/parent to the root pom.xml <module>
Change-Id: Ie1777f43f343fe8d5d1b2b850bc4f0f2e3fa230b
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 27 Jan 2014 22:30:10 +0000 (14:30 -0800)]
Fixed trailing / to satisfy the versions plugin
Change-Id: Ia38b61f49b71b3c0536604800ffcbadd1bf8ff3e
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 27 Jan 2014 22:07:31 +0000 (14:07 -0800)]
Update to new version of the artifacts proposed by jenkins-ovsdb-version-changes-8
Change-Id: If628434027c91a82c6b4a72baf04959f5a2ac4a0
Signed-off-by: Jenkins ovsdb silo <jenkins-ovsdb@jenkins002.cvo.opendaylight.org>
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
Madhu Venugopal [Mon, 27 Jan 2014 20:38:31 +0000 (12:38 -0800)]
Removed the optimization that was preventing the flows to be programmed on nodes where the Network wasnt present.
But, since we dont have the replay fix which can look back at all the nodes and reinstall the existing VM Macs,
we have to remove this optimziation.
We can reintroduce this fix, once we have the replay functionality in place.
Change-Id: I6baaa180a91f7188d472b34ef609ea95b2fac653
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>