ovsdb.git
7 years agobug 6579 checking the depency before transaction 24/48924/3
K.V Suneelu Verma [Thu, 1 Dec 2016 18:20:27 +0000 (23:50 +0530)]
bug 6579 checking the depency before transaction

integrated the mcast , ucast mac and logical switch with dependency queue

Change-Id: I60643affc1d275b5a1b3586147ac83a67a01d22d
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agobug 6579 added dependency queue 50/48850/6
K.V Suneelu Verma [Thu, 1 Dec 2016 07:11:23 +0000 (12:41 +0530)]
bug 6579 added dependency queue

Added Dependency Queue which gets processed upon config and op events.
Any object ( mac / port ) whose dependencies are not met gets pushed the
queue with an expiry timeout.

Added the following apis in UnMetDependencyGetter
getInTransitDependencies    returns list of keys in json rpc transaction
which are needed by this object to be processed.
getUnMetConfigDependencies returns list of missing config keys

Added the following apis in HwvtepDeviceInfo
onConfigDataAvailable processes config dependency queue
onOpDataAvailable     processes in transit dependency queue , gets called
after every json rpc transaction is done

Change-Id: I012958a40e0ab0aa0e0db14dc670f9c4dacbdd09
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agobug 6579 handling back to back tx updates 41/48741/5
K.V Suneelu Verma [Mon, 28 Nov 2016 14:14:50 +0000 (19:44 +0530)]
bug 6579 handling back to back tx updates

Added the following utility methods in operational state and device info
isKeyPartOfCurrentTx indicates this key is also part of the same tx
isKeyInTransit indicates this key is part of prev tx to device

Before inserting any key into any table
check if this key or its dependent keys are part of prev transaction

Change-Id: I87699c244b7feee27d2c95178dfe5727f4148cdb
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agobug 6579 added basic unit tests 26/48726/6
K.V Suneelu Verma [Mon, 28 Nov 2016 07:29:20 +0000 (12:59 +0530)]
bug 6579 added basic unit tests

Added unit tests for the following commands
McastMacsRemoteUpdateCommand
UcastMacsRemoteUpdateCommand
LogicalSwitchUpdateCommand

When logical switch is configured ensure that op.insert is fired
same with mcast mac and ucast mac also.

Change-Id: Ie08664faa233776f82fb0a4ea8d6f0522a4b4810
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agoAdd docs for OVSDB 49/49049/3
Vishal Thapar [Tue, 6 Dec 2016 17:53:45 +0000 (23:23 +0530)]
Add docs for OVSDB

This patch just initializes sphinx for OVSDB.

Refer: https://git.opendaylight.org/gerrit/#/c/39142/

Change-Id: I1e2b0c83941fdf2d1ab080863d6d6b3fc04e94b0
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
7 years agoSpecify karaf dependency types 78/49078/1
Stephen Kitt [Wed, 7 Dec 2016 07:57:25 +0000 (08:57 +0100)]
Specify karaf dependency types

The -karaf projects only produce .zip and .tar.gz artifacts, so the
-it projects need to specify a type. (Our Nexus provides fake
dependencies to handle this type of situation, but local builds
without snapshot repositories fail.)

Change-Id: Icac98ceab94da4fc49862d5bddae04da4f4a0602
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoCheckstyle clean-up: Remove useless "final" in interfaces 27/48627/1
Michael Vorburger [Wed, 23 Nov 2016 13:58:24 +0000 (14:58 +0100)]
Checkstyle clean-up: Remove useless "final" in interfaces

The "final" in interfaces only shows up for me in Eclipse, but doesn't
fail the CLI build; I suspect that is becaues of a slightly different CS
version in-IDE and on CLI; on the next CS upgrade this probably would
have been seen in the build as well, and so it's good to clean it up.

Change-Id: Id235738c1217c32e16c756ad876672b609fd3172
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agobug 7202 upon node reboot hwvtep op ds is missing 64/48464/5
K.V Suneelu Verma [Fri, 18 Nov 2016 07:21:45 +0000 (12:51 +0530)]
bug 7202 upon node reboot hwvtep op ds is missing

When the cluster is rebooted hwvtep operational datastore is not populated
for the existing clients.
Existing clients keep retrying , the moment 6640 port is up they establish
connection.
But by that time hwtep bundle is not up.
Eventually when the bundle is up it is only notified of future clients
only and not the already existing clients.

Change-Id: Ic816aea61c43000d7c8fbf14e51e0bcc5661664e
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agobug 7201 skip monitoring stats tables 62/48462/4
K.V Suneelu Verma [Fri, 18 Nov 2016 06:18:18 +0000 (11:48 +0530)]
bug 7201 skip monitoring stats tables

skip monitoring stats table and version columns
which are generating huge traffic to controller

Change-Id: Icb84f92262d7e9464291a6f233a741a767d79003
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agoPrep for provider network IT 57/47757/3
Josh [Sun, 30 Oct 2016 14:56:01 +0000 (16:56 +0200)]
Prep for provider network IT

1. Support for configuring OvsdbPing timeout (probably not necessary but
left it in anyway
2. Support for docker-compose version 2 yaml
3. Support for not specifying ovsdb.controller.address. If this env var
is not passed in, DockerOvs will create a docker network and use that
instead. See the javadoc in DockerOvs.java for more details.

Change-Id: Ife26f5f241ed6a45b00b15750a8ebafa471f8434
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoCorrected data type for "src-mac" in hwvtep.yang 83/47883/1
Shashidhar Raja [Thu, 3 Nov 2016 12:22:03 +0000 (17:52 +0530)]
Corrected data type for "src-mac" in hwvtep.yang

Change-Id: I6c866000dc527cb24890a05890793a2deed5a664
Signed-off-by: Shashidhar Raja <shashidharr@altencalsoftlabs.com>
7 years agoBug 6851 fix: handling OtherConfig column clear 22/46022/9
Tarun Thakur [Thu, 22 Sep 2016 07:45:24 +0000 (13:15 +0530)]
Bug 6851 fix: handling OtherConfig column clear

This fix would take care of updating datastore for the OVSDB Node
when 'other_config' column is cleared from openvswitch table.

Update to handle case OtherConfig column cleared

setOtherConfig() is updated to handle all cases to set OtherConfig
in Ovsdb node if present in OpenVSwitch new entry and to remove
OtherConfig from Ovsdb node if present in OpenVSwitch old entry.

Current method was missing the case when OtherConfig is cleared for
OVS table from switch. This case was generating the condition when
OtherConfig is NULL for OpenVSwitch new entry and OtherConfig is
non-NULL for OpenVSwitch old entry.

Change-Id: I366ce0f160079e211e5fe02b0e16c84df40d34cf
Signed-off-by: Tarun Thakur <tarun.t@altencalsoftlabs.com>
7 years agobug 6643 hwvtep configuration reconcilation 91/44091/17
K.V Suneelu Verma [Tue, 16 Aug 2016 17:32:52 +0000 (23:02 +0530)]
bug 6643 hwvtep configuration reconcilation

Added operational node listener to trigger reconcillation
listens for physical switch node added event and schedules the reconcillation.
trigger transactions for changes in macs and logical switches and vlan bindings
trigger transactions for removal of local ucast and mcast macs aswell
so that to be deleted logical switches will not have any references
cancel the queued reconcilation task if any upon receiving node disconnect event

fixed some npes in mac remove commands
run the logical switch remove command post mac entries remove command as
those logical switches removed logical swithes have to be visible in the
other remove commands

validated the following test cases
1) disconnect the device and push the config (logical switch and remote
macs and vlan bindings ) and connect the device again
2) disconnect the device and delete some confing and connect the device
again

Change-Id: I12d0692e4c8b040f261a9c2cc5cffc05bef96f0d
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agoChange cipher suites for SSL connection 10/46010/5
Hsin-Yi Shen [Mon, 19 Sep 2016 15:57:23 +0000 (08:57 -0700)]
Change cipher suites for SSL connection

Change the list of enabled protocls and cipher suites to meet FIPs security requirement.
Following protocols and cipher suites will be enabled:
ssl protocols [SSLv2Hello, TLSv1.1, TLSv1.2]
cipher suites [TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256, TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
TLS_RSA_WITH_AES_127_CBC_SHA256]

Change-Id: Ie257c8c89a789911255e92b54997b915deb6c2a4
Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
7 years agoBug 6692: don't mock Optional 19/45719/2
Stephen Kitt [Fri, 16 Sep 2016 08:49:27 +0000 (10:49 +0200)]
Bug 6692: don't mock Optional

There's no need to ever mock Optional.

Change-Id: I31a875fc7c2201f066af057c616538a7a998ef7a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 6692: remove InstanceIdentifierCodec instance from SBU 33/45633/3
Stephen Kitt [Thu, 15 Sep 2016 12:36:59 +0000 (14:36 +0200)]
Bug 6692: remove InstanceIdentifierCodec instance from SBU

Turn SouthboundUtil into a "clean" utility class: pull out all methods
involving InstanceIdentifierCodec.

Change-Id: I68f93fd7295b99ac6e29e4f7fcee744b38372630
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 6692: use non-deprecated firstKeyOf() variant 59/45959/4
Stephen Kitt [Wed, 21 Sep 2016 08:22:49 +0000 (10:22 +0200)]
Bug 6692: use non-deprecated firstKeyOf() variant

This patch also adds a cast in SouthboundUtilTest to fix a
false-positive deprecation detection.

Change-Id: I10fa53e40575c66de622887a84353abe2eba2786
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 5995: remove org.json 29/46129/1
Stephen Kitt [Fri, 23 Sep 2016 13:04:27 +0000 (15:04 +0200)]
Bug 5995: remove org.json

org.json doesn't seem to be used in ovsdb, remove it.

Change-Id: I5d09d5a6a860e91fa43affe83d322fbb3d5c7be9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMerge "Bug 6692: improve TyperUtils tests (first pass)"
Anil Vishnoi [Fri, 16 Sep 2016 20:21:35 +0000 (20:21 +0000)]
Merge "Bug 6692: improve TyperUtils tests (first pass)"

7 years agoMerge "Bug 6692: clean up MonitorRequestBuilder"
Anil Vishnoi [Fri, 16 Sep 2016 20:12:54 +0000 (20:12 +0000)]
Merge "Bug 6692: clean up MonitorRequestBuilder"

7 years agoBug 6692: improve TyperUtils tests (first pass) 31/45431/4
Stephen Kitt [Mon, 5 Sep 2016 12:35:58 +0000 (14:35 +0200)]
Bug 6692: improve TyperUtils tests (first pass)

This also drops the unused type parameter on getTableSchema().

For now we preserve the IllegalArgumentException-based behaviour in
getTableSchema() (instead of handling the missing schema and returning
null).

Change-Id: If704a3d94694f44d6ccad6536cb230d09fa4e4b5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 6692: clean up MonitorRequestBuilder 52/44952/2
Stephen Kitt [Wed, 31 Aug 2016 16:36:58 +0000 (18:36 +0200)]
Bug 6692: clean up MonitorRequestBuilder

MonitorRequest can't be made immutable, so the utility of this builder
is to support fluent-style construction and addColumns() with multiple
columns. This patch removes unneeded methods from MonitorRequest,
drops the static builder() in favour of the constructor, adds support
for addColumns() with multiple strings, and constructs a new instance
for every call to build(). It also performs the skip cleanup in one
step instead of looping over the columns.

Change-Id: I89fd8a554551c3142efc82dbf6bb43417c6148ae
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoMerge "Clean up SouthboundConstants"
Anil Vishnoi [Sat, 10 Sep 2016 00:29:25 +0000 (00:29 +0000)]
Merge "Clean up SouthboundConstants"

7 years agoMerge "Fix clear bug related to "num" in JSON Node"
Anil Vishnoi [Fri, 2 Sep 2016 06:21:13 +0000 (06:21 +0000)]
Merge "Fix clear bug related to "num" in JSON Node"

7 years agoBug 6486: get right docker instance 02/45002/1
Sam Hague [Thu, 1 Sep 2016 13:46:06 +0000 (09:46 -0400)]
Bug 6486: get right docker instance

Change-Id: I7319674e4ed54f45582b4ccd38a48ddcdad51be4
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoClean up SouthboundConstants 51/44951/1
Stephen Kitt [Wed, 31 Aug 2016 15:45:52 +0000 (17:45 +0200)]
Clean up SouthboundConstants

Remove the values in SKIP_OVSDB_TABLE, they aren't used; if any
complementary information needs to be provided, it should be done as
comments. (As it stands the information doesn't seem to be useful.)

Use the varargs variants of Arrays.asList() in SKIP_COLUMN_FROM_TABLE,
or Collections.singletonList() for single values.

Change-Id: I32f9dddaca922cd82cf4646aa6ebeb96e5546c3d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
7 years agoBug 6486: get right docker instance 58/44958/1
Sam Hague [Tue, 30 Aug 2016 22:17:56 +0000 (18:17 -0400)]
Bug 6486: get right docker instance

Change-Id: I35d7e773dd4f9bccf46a790b6e3699166ba0b6a1
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoMerge "Bug 5555: Exception during operations on ReadWriteTransaction"
Anil Vishnoi [Mon, 29 Aug 2016 19:48:29 +0000 (19:48 +0000)]
Merge "Bug 5555: Exception during operations on ReadWriteTransaction"

7 years agoFix clear bug related to "num" in JSON Node 45/42345/3
Michael Vorburger [Fri, 22 Jul 2016 22:07:53 +0000 (00:07 +0200)]
Fix clear bug related to "num" in JSON Node

Before this change, getConstraints() would call populateEnum()  which
would ... do nothing, ultimately; this was pointless, as it is currently
implemented.

I'm assuming here that the code was meant to do what I turned it into,
but I don't understand enough of this code to be certain.  I've also NOT
tested this in any way.  It does kind of seem reasonable though, looking
at what the lines before in getConstraints do.

An alternative would be to just remove those populateEnum methods - if
they do nothing, and there is no real bug here, then that was just dead
code.  More likely, I suspect it is a real bug that hasn't been found
yet.

I'll try to add FindBugs error detection for such cases in the future -
UC_USELESS_OBJECT is exactly for finding these kind of programming
errors, AFAIK.

Change-Id: I587e053b5145320b600e2db0109118d799da8822
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoFixed inappropriate WARN message. 49/44749/1
Hideyuki Tai [Thu, 25 Aug 2016 13:45:44 +0000 (06:45 -0700)]
Fixed inappropriate WARN message.

The plugin output the following inappropriate WARN message sometimes.

    Found non-topological node Optional.absent() on path {}

This patch fixed the inappropriate message, and changed the log level
from WARN to DEBUG because it is a debug information.

Other change:
  Modified the code which used Optional<> in an ineffective way.

Change-Id: I714a10b509e9a88676e910ec9fba717800c52272
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
7 years agoBug 6486: Add support for two node DockerOvs 94/44694/1
Sam Hague [Fri, 26 Aug 2016 01:23:08 +0000 (21:23 -0400)]
Bug 6486: Add support for two node DockerOvs

Change-Id: I61996cc2bc5b573309f6c389c670e09540aa2710
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoBug 5555: Exception during operations on ReadWriteTransaction 90/44090/2
K.V Suneelu Verma [Tue, 16 Aug 2016 17:23:48 +0000 (22:53 +0530)]
Bug 5555: Exception during operations on ReadWriteTransaction

An IllegalStateException can be happened during operations on
ReadWriteTransaction. This was resulting in system not being able to
process any southbound ovsdb events, since the code didn't handle this
exception.

Change-Id: I24ab3acc01fd5fb4d9380ccc8bcc7d332738d242
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>
7 years agoMerge "Bug 6505 - blueprint managed-property is not reading the .cfg file during...
Sam Hague [Tue, 23 Aug 2016 16:24:41 +0000 (16:24 +0000)]
Merge "Bug 6505 - blueprint managed-property is not reading the .cfg file during the reboot."

7 years agoMerge "Bug 6475: Removed unnecessary read operations."
Anil Vishnoi [Tue, 23 Aug 2016 08:00:04 +0000 (08:00 +0000)]
Merge "Bug 6475: Removed unnecessary read operations."

7 years agoBug 6505 - blueprint managed-property is not reading the .cfg file during the reboot. 18/44518/2
Anil Vishnoi [Mon, 22 Aug 2016 21:25:30 +0000 (14:25 -0700)]
Bug 6505 - blueprint managed-property is not reading the .cfg file during the reboot.

Change-Id: Ifb70a789e809ff5ecaa1cf138fa915606f530bfd
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 6506: Add bridge stp_enble to ovsdb.yang 25/44225/3
Peng Zhang [Thu, 18 Aug 2016 03:10:55 +0000 (11:10 +0800)]
Bug 6506: Add bridge stp_enble to ovsdb.yang

We can use command "ovs-vsctl" to enbale spanning tree protocol on a bridge,
e.g., "ovs-vsctl set Bridge br0 stp_enable=true". But there is missing the
stp_enble in ovsdb.yang.

Change-Id: Ied5c093fb739f220fe673c80cd74cf84be7e0c0b
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
7 years agoBug 6475: Removed unnecessary read operations. 26/44526/1
Hideyuki Tai [Thu, 18 Aug 2016 20:51:11 +0000 (13:51 -0700)]
Bug 6475: Removed unnecessary read operations.

Some classes always read data from MD-SAL even in the case they don't
use these data. This patch modified these classes to remove unnecessary
read operations.

Other change:

 * Removed unused members
   - updatedOpenVSwitchRows from OvsdbQosRemovedCommand.java
   - updatedOpenVSwitchRows from OvsdbQueueRemovedCommand.java

Change-Id: I53af02892bbfbb8f4f95ab94d988825fbc832f1b
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
7 years agoBug 6486 - Add waits for IT Utils 48/44448/1
Sam Hague [Mon, 22 Aug 2016 02:02:51 +0000 (22:02 -0400)]
Bug 6486 - Add waits for IT Utils

Change-Id: I9e537ecf65cf4c88408213760b8119b7be709505
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoBug 6486 - Add waits for IT Utils 22/44422/2
Sam Hague [Sat, 20 Aug 2016 01:36:39 +0000 (21:36 -0400)]
Bug 6486 - Add waits for IT Utils

Change-Id: Ieea6276eda62f4b437436bf73336c8dea2aa0c0b
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoMerge "Bug 6472 - JsonRpcEndpoint Reaper Thread's daemon property is not set"
Sam Hague [Fri, 19 Aug 2016 22:01:19 +0000 (22:01 +0000)]
Merge "Bug 6472 - JsonRpcEndpoint Reaper Thread's daemon property is not set"

7 years agoBUG 6467: Add cli flag to use virtual environment 20/44420/1
Victor Pickard [Fri, 19 Aug 2016 20:12:27 +0000 (16:12 -0400)]
BUG 6467: Add cli flag to use virtual environment

Add a trailing "/" to $WORKSPACE being passed in.
Works a little different in jenkins than on
local machine.

Change-Id: I1a12aa0a7f10a1fe621a1bf7c8def203630297be
Signed-off-by: Victor Pickard <vpickard@redhat.com>
7 years agoBUG 6467: Add cli flag to use virtual environment 14/44414/1
Victor Pickard [Fri, 19 Aug 2016 18:03:34 +0000 (14:03 -0400)]
BUG 6467: Add cli flag to use virtual environment

This change is a followup to patch:
 https://git.opendaylight.org/gerrit/#/c/44022/

Add cli flag for virtual environment

Docker-compose is installed in a virtual environment on Jenkins.

Add a cli flag to enable switching to a virtual environment, if needed.

Netvirt IT requires docker-compose, so the netvirt IT jenkins
script will set this flag: -Ddocker.vEnvWs=$WORKSPACE

Change-Id: I989d071ef2303f4b4813c3145435b2ddb785a228
Signed-off-by: Victor Pickard <vpickard@redhat.com>
7 years agoBug 6472 - JsonRpcEndpoint Reaper Thread's daemon property is not set 40/44340/1
Anil Vishnoi [Thu, 18 Aug 2016 23:23:47 +0000 (16:23 -0700)]
Bug 6472 - JsonRpcEndpoint Reaper Thread's daemon property is not set

Change-Id: I0cfd2a192eed62eab988831398f8f8e89876417e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoMerge "Add cli flag for virtual environment"
Anil Vishnoi [Thu, 18 Aug 2016 15:58:26 +0000 (15:58 +0000)]
Merge "Add cli flag for virtual environment"

7 years agoMerge "Bug 6454: ProcUtils stdout should be grouped together"
Sam Hague [Thu, 18 Aug 2016 12:31:42 +0000 (12:31 +0000)]
Merge "Bug 6454: ProcUtils stdout should be grouped together"

7 years agoBug 6454: ProcUtils stdout should be grouped together 12/44212/3
Sam Hague [Wed, 17 Aug 2016 21:34:21 +0000 (17:34 -0400)]
Bug 6454: ProcUtils stdout should be grouped together

Change-Id: I559d66666c7f8af05f3f380ed9a90c77b1437691
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoBug 6463 - Monitoring _version column on the ovsdb 39/44239/1
Anil Vishnoi [Thu, 18 Aug 2016 10:04:11 +0000 (03:04 -0700)]
Bug 6463 - Monitoring _version column on the ovsdb
table is generating huge updates from switch

Change-Id: I421d2af0adabb2197af7ec2ccb68a2e95e58d2e1
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoFilter out monitor updates for some columns 68/20568/11
Vishal Thapar [Tue, 19 Jul 2016 16:19:25 +0000 (21:49 +0530)]
Filter out monitor updates for some columns

This filters out statistics and _version columns from all tables
when setting up monitoring for table updates.

This also filters out status column for Controller table.

Change-Id: I3ed875a6070c2ce61ab8ecf626a6856f99f8179f
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
7 years agoAdd cli flag for virtual environment 22/44022/4
Victor Pickard [Mon, 15 Aug 2016 21:55:10 +0000 (17:55 -0400)]
Add cli flag for virtual environment

Docker-compose is installed in a virtual environment on Jenkins.

Add a cli flag to enable switching to a virtual environment, if needed.

Netvirt IT requires docker-compose, so the netvirt IT jenkins
script will set this flag: -DuseVenv=true

Change-Id: Ie66e274dd10f1cefcbe134d837faea7c52a55013
Signed-off-by: Victor Pickard <vpickard@redhat.com>
Signed-off-by: Sam Hague <shague@redhat.com>
Signed-off-by: Victor Pickard <vpickard@redhat.com>
7 years agoBug 6332 - Conflicting modification Exception for topology path 37/44137/1
Anil Vishnoi [Wed, 17 Aug 2016 11:41:57 +0000 (04:41 -0700)]
Bug 6332 - Conflicting modification Exception for topology path

Change-Id: Id7e8403c666689042eb73066f6203bb8edec0b41
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 6336 using single tx for logical switch, macs 83/43683/1
Akash [Thu, 11 Aug 2016 06:54:01 +0000 (12:24 +0530)]
Bug 6336 using single tx for logical switch, macs

To handle the issue if logical switch is not present in OP tree then
logical siwtch name will be fetch from instanceIdentifier sub node as part
of the function getLogicalSwitchUUID in TransactUtils.java class.

Change-Id: Id3addade78464f967019c9c87053856bb111aed4
Signed-off-by: Akash <a.k.sahu@ericsson.com>
7 years agoBump versions by 0.1.0 for next dev cycle 38/43438/1
Thanh Ha [Mon, 8 Aug 2016 21:50:19 +0000 (17:50 -0400)]
Bump versions by 0.1.0 for next dev cycle

Change-Id: Ic49b3af15fcadabc68d88eb0c891bf6c36eff192
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
7 years agoMerge "Bug 6352 - [SR3] RPC timeout in JsonRPCEndpoint is not configurable"
Sam Hague [Mon, 8 Aug 2016 18:02:08 +0000 (18:02 +0000)]
Merge "Bug 6352 - [SR3] RPC timeout in JsonRPCEndpoint is not configurable"

7 years agoBug 6352 - [SR3] RPC timeout in JsonRPCEndpoint is not configurable 76/43276/3
Anil Vishnoi [Sun, 7 Aug 2016 02:23:41 +0000 (19:23 -0700)]
Bug 6352 - [SR3] RPC timeout in JsonRPCEndpoint is not configurable

Change-Id: I4d35c64d61a6732441a942abd4a766551506f2d5
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoSwitch from yangtools to mdsal binding APIs 08/43108/4
Robert Varga [Thu, 4 Aug 2016 10:35:26 +0000 (12:35 +0200)]
Switch from yangtools to mdsal binding APIs

This reflects the move of these interfaces from yangtools
to mdsal.

Change-Id: I5532deea7396104a4a850124f9a0ca21c8f275af
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agoMerge "added support for switch/port fault status for hwvtep schema changes."
Anil Vishnoi [Fri, 5 Aug 2016 21:12:39 +0000 (21:12 +0000)]
Merge "added support for switch/port fault status for hwvtep schema changes."

7 years agoMerge "Docker-compose files for hwvtep IT, ovs 2.4/2.5"
Anil Vishnoi [Thu, 4 Aug 2016 21:12:08 +0000 (21:12 +0000)]
Merge "Docker-compose files for hwvtep IT, ovs 2.4/2.5"

7 years agoMerge changes from topic 'move-karaf-parent'
Anil Vishnoi [Thu, 4 Aug 2016 19:47:30 +0000 (19:47 +0000)]
Merge changes from topic 'move-karaf-parent'

* changes:
  Bug 6278: Switch to use odlparent's karaf-parent
  Bug 6278: Switch to use odlparent's karaf-parent

7 years agoadded support for switch/port fault status for hwvtep schema changes. 72/42772/4
ENIAGUA [Fri, 29 Jul 2016 09:18:15 +0000 (14:48 +0530)]
added support for switch/port fault status for hwvtep schema changes.

Change-Id: I2e66a9dc8f71393168daf0f14e7f1563c4fae1ed
Signed-off-by: ENIAGUA <nishchya.gupta@ericsson.com>
7 years agoDocker-compose files for hwvtep IT, ovs 2.4/2.5 52/43052/3
Josh [Wed, 3 Aug 2016 16:04:22 +0000 (18:04 +0200)]
Docker-compose files for hwvtep IT, ovs 2.4/2.5

Change-Id: Id1b38786f78ee9f9b22e6168c99d9ac3988fc678
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoMerge "Bug 6278: Switch to use odlparent's karaf-parent"
Anil Vishnoi [Thu, 4 Aug 2016 00:12:23 +0000 (00:12 +0000)]
Merge "Bug 6278: Switch to use odlparent's karaf-parent"

7 years agoMerge "Bug 6278: Switch to use odlparent's karaf-parent"
Anil Vishnoi [Thu, 4 Aug 2016 00:12:08 +0000 (00:12 +0000)]
Merge "Bug 6278: Switch to use odlparent's karaf-parent"

7 years agoBug 6278: Switch to use odlparent's karaf-parent 64/43064/1
Ryan Goulding [Wed, 3 Aug 2016 16:38:16 +0000 (12:38 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Change-Id: I0052370159e7a061bc7aa2566907549b8c416208
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agobug-6326 Modify config, not operational version 79/42979/3
Josh [Tue, 2 Aug 2016 15:15:31 +0000 (17:15 +0200)]
bug-6326 Modify config, not operational version

pull bridge from config before modifying
+ only write controllers that don't already exist

Change-Id: I6f6d2a9fa33459988da8450065714ec86eab5781
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoMerge "Bug 5951 - Termination point config reconciliation"
Anil Vishnoi [Mon, 1 Aug 2016 19:29:47 +0000 (19:29 +0000)]
Merge "Bug 5951 - Termination point config reconciliation"

7 years agoBug 5951 - Termination point config reconciliation 07/42807/2
Vinh Nguyen [Fri, 17 Jun 2016 19:06:01 +0000 (12:06 -0700)]
Bug 5951 - Termination point config reconciliation

Add termination point configuration reconciliation logic
to southbound plugin.

When the OVS switch connects to the ODL, the list of all bridge
and termination point configurations in the config datastore
is obtained. We then listens for any new bridge creations in the
operational DS. If the newly created bridge is in the above described
list, termination point reconciliation is triggered for that bridge.

This is the solution for reconciliation scenarios #5 and #7 in:
https://wiki.opendaylight.org/view/OVSDB_Integration:OVSDB_SB_Reconciliation

Change-Id: Ie0fc8bcbd12a5c1dd763a580db7097a4afd7e01a
Signed-off-by: Vinh Nguyen <vinh.nguyen@hcl.com>
7 years agoAdd various methods to SouthboundUtils 93/42693/5
Josh [Thu, 28 Jul 2016 11:13:33 +0000 (13:13 +0200)]
Add various methods to SouthboundUtils

These are required by netvirt for vlan
and tunnel support

Change-Id: Ied88f25ca4c22babaedb95bc2bea9190f41d3d29
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoMerge "Add getTerminationPointOfBridge method to SouthboundUtils"
Anil Vishnoi [Fri, 29 Jul 2016 19:27:34 +0000 (19:27 +0000)]
Merge "Add getTerminationPointOfBridge method to SouthboundUtils"

7 years agoMerge "Bug 6304 - Regression in Connection reconciliation functionality"
Vishal Thapar [Fri, 29 Jul 2016 08:34:05 +0000 (08:34 +0000)]
Merge "Bug 6304 - Regression in Connection reconciliation functionality"

7 years agoBug 6304 - Regression in Connection reconciliation functionality 57/42757/1
Anil Vishnoi [Fri, 29 Jul 2016 04:35:07 +0000 (21:35 -0700)]
Bug 6304 - Regression in Connection reconciliation functionality

After enabling the checkstyle, we start catching the
specific exceptions rather then catching all the exception
using Exception. During the retry, connection task encounters
ConnectionException, but nobody catches that exception and
it kills the reconciliation thread, so it does not retry
the connection after first attempt. This patch fixes this
issue and handles the ConnectionException properly.

Change-Id: I0e1f71ea6fa550df484ade9036f7dfe6c9dfa57e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 6284 - Cancellation exceptions during operation execution 75/42675/3
Anil Vishnoi [Thu, 28 Jul 2016 07:27:13 +0000 (00:27 -0700)]
Bug 6284 - Cancellation exceptions during operation execution

Change-Id: Icacfa535dc4ac3aa146ab73d363a9888542e3a8e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoBug 6278: Switch to use odlparent's karaf-parent 63/43063/1
Ryan Goulding [Thu, 28 Jul 2016 16:03:55 +0000 (12:03 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Change-Id: Ib10f2a4ddeeda607890145cbe277d72c4ebf3d6e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoBug 6278: Switch to use odlparent's karaf-parent 26/42726/1
Ryan Goulding [Thu, 28 Jul 2016 16:03:28 +0000 (12:03 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Change-Id: Iafc12b95e41de5b043648149be9eade00773f82b
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoBug 6278: Switch to use odlparent's karaf-parent 25/42725/1
Ryan Goulding [Thu, 28 Jul 2016 16:02:51 +0000 (12:02 -0400)]
Bug 6278: Switch to use odlparent's karaf-parent

Change-Id: I0781e8ae2b14af68e32d3048fe17370cca276425
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
7 years agoAdd getTerminationPointOfBridge method to SouthboundUtils 10/42710/1
Oded Shvartz [Thu, 28 Jul 2016 12:59:23 +0000 (15:59 +0300)]
Add getTerminationPointOfBridge method to SouthboundUtils

instead of duplicating the method for the new netvirt project
the method was added to SouthboundUtils.

Change-Id: Idda2640c80fbbb96a03a5f4f248ccb87ed1c65a2
Signed-off-by: Oded Shvartz <oshvartz@redhat.com>
7 years agoBUG-6136 - Southbound plugin throws IllegalStateException when add bridge config... 32/42332/2
vinoth [Wed, 22 Jun 2016 13:47:20 +0000 (19:17 +0530)]
BUG-6136 - Southbound plugin throws IllegalStateException when add bridge config via POST.
   * Checking isPresent() while reading a OvsdbBridgeAugumentation value.

Change-Id: I1ac53efca678c9e40f46f5e86595b0c1d9e8bc62
Signed-off-by: vinoth <m.vinoth@hcl.com>
7 years agoMerge "Checkstyle fixes (to be enforced)"
Sam Hague [Sat, 23 Jul 2016 19:26:23 +0000 (19:26 +0000)]
Merge "Checkstyle fixes (to be enforced)"

7 years agoMerge "Add support for setting the db schema version"
Sam Hague [Sat, 23 Jul 2016 13:58:13 +0000 (13:58 +0000)]
Merge "Add support for setting the db schema version"

7 years agoAdd support for setting the db schema version 42/42342/2
Sam Hague [Fri, 22 Jul 2016 01:38:49 +0000 (21:38 -0400)]
Add support for setting the db schema version

The db schema was a field in the ovsdb.yang but it was never copied
from the ovsdb to mdsal.

Also removed IT test code that was getting the schema version
via connecting to the ovsdb nodes.

Change-Id: Id7a49f9832c27eec746aeff9d190e9295dbd3244
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoCheckstyle fixes (to be enforced) 44/42344/2
Michael Vorburger [Fri, 22 Jul 2016 21:05:19 +0000 (23:05 +0200)]
Checkstyle fixes (to be enforced)

preparing for https://git.opendaylight.org/gerrit/#/c/41305/ with:
  * Utility classes should have private constructor
  * potential future problems re. hidden fields
  * inner assignments

Change-Id: I616414ed56e468910167a790b5e67a6807600f37
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoFixes for HwvtepSouthboundIT to run 35/42335/1
Sam Hague [Fri, 22 Jul 2016 19:28:49 +0000 (15:28 -0400)]
Fixes for HwvtepSouthboundIT to run

Change-Id: I12adb6221e18fd5d80c9b053c4f03b7d1d79b730
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoCheckstyle fixes for ovsdb test dirs 26/42326/2
Sam Hague [Fri, 22 Jul 2016 16:56:54 +0000 (12:56 -0400)]
Checkstyle fixes for ovsdb test dirs

Change-Id: I96d5843f9b26463f89e54992aea34b2438b571d4
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoFix more Sonar (soon Checkstyle) constant name 49/42249/4
Michael Vorburger [Thu, 21 Jul 2016 16:08:28 +0000 (18:08 +0200)]
Fix more Sonar (soon Checkstyle) constant name

Change-Id: I503e402c80d57c946805385ac542b992eed1cf8a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoBug 6185 - southbound system tests failing when 13/42113/3
Anil Vishnoi [Tue, 19 Jul 2016 19:43:56 +0000 (12:43 -0700)]
Bug 6185 - southbound system tests failing when
run with all other compatible OpenDaylight features.

This patch fixes following issues related to library
connection handling
*.* If any non-ovsdb device (e.g. openflow) sends a
connection request to ovsdb, library does not throw
error message, rather it holds the channel and wait
for timeout.
*.* In the above case, it also publishes the connect/disconnect
notification up to the plugin.
*.* HwvtepConnectionInstance and OvsdbConnectionInstance
is implementing OvsdbClient interface from library, that
is not required. Echo service should be done by the library
and not by the plugin logic code.
*.* RPC Future objects were not cleaned by library,
and that's leaking the memory.
*.* In case of no echo response, library dosn't fail
the respective rpc future object.

Change-Id: If7b26594b057465d0c08638857bdcb76857705e1
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoCheckstyle enforcement for library 71/41271/3
Michael Vorburger [Mon, 4 Jul 2016 12:26:09 +0000 (14:26 +0200)]
Checkstyle enforcement for library

Following relaxation of rule in odl-parent to have JavaDoc not even
enforced on annotation types

Change-Id: I05b27d56062b7d57928eb2f04eb538cdbf482e72
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoReduce IT logging 97/42097/1
Sam Hague [Tue, 19 Jul 2016 21:21:50 +0000 (17:21 -0400)]
Reduce IT logging

Change-Id: Ic86cca7fcd8bfa9829041dd3abd37fa276cde44f
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoMerge "checkstyle fixes for library"
Anil Vishnoi [Tue, 19 Jul 2016 15:19:11 +0000 (15:19 +0000)]
Merge "checkstyle fixes for library"

7 years agoUse StandardCharsets instead of Guava 77/41977/2
Robert Varga [Mon, 18 Jul 2016 14:23:03 +0000 (16:23 +0200)]
Use StandardCharsets instead of Guava

Use of Guava's Charsets for recent Java versions is deprecated.

Change-Id: Iefdaca294dbbcfbcd0a9b97074dd4612f348cfa7
Signed-off-by: Robert Varga <rovarga@cisco.com>
7 years agocheckstyle fixes for library 33/41933/2
Sam Hague [Sun, 17 Jul 2016 19:58:03 +0000 (15:58 -0400)]
checkstyle fixes for library

Change-Id: If68706ed7cf2bb2c605f4e2b3894c273f57643d3
Signed-off-by: Sam Hague <shague@redhat.com>
7 years agoMerge "Add methods to SouthboundUtils for ElanService"
Sam Hague [Mon, 18 Jul 2016 12:10:43 +0000 (12:10 +0000)]
Merge "Add methods to SouthboundUtils for ElanService"

7 years agoFix docker compose ps command 53/41953/1
Oded Shvartz [Mon, 18 Jul 2016 09:10:57 +0000 (12:10 +0300)]
Fix docker compose ps command

Changed docker-compose ps command to use -f <yamlFile>.
This change is necessary after moving the docker-compose.yml file
on the netvirt project to resources folder.

Change-Id: Ibdfde4180519341ada5b105096f85cd2be77964b
Signed-off-by: Oded Shvartz <oshvartz@redhat.com>
7 years agoAdd methods to SouthboundUtils for ElanService 46/41946/2
Josh [Mon, 18 Jul 2016 07:43:53 +0000 (09:43 +0200)]
Add methods to SouthboundUtils for ElanService

Methods are required for creating bridges, etc,
for external physical networks. See:
https://git.opendaylight.org/gerrit/#/c/41925/

Change-Id: I707e8fc5298890a886352dcc90a86159b9f3236c
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoFix IT failure when not running DockerOvs docker 27/41927/1
Josh [Sun, 17 Jul 2016 14:53:27 +0000 (16:53 +0200)]
Fix IT failure when not running DockerOvs docker

Change-Id: If94a12f0ace958609bf135aa639128423a513228
Signed-off-by: Josh <jhershbe@redhat.com>
7 years agoBug 5938 - Updated the logging 19/41919/1
ananthip [Mon, 11 Jul 2016 13:49:10 +0000 (09:49 -0400)]
Bug 5938 - Updated the logging

Change-Id: I429f71d27ca751b5a53808defca98a1bbb983977
Signed-off-by: ananthip <ananthip@hcl.com>
7 years agoMerge "Upgrade ietf-{inet,yang}-types to 2013-07-15"
Thanh Ha [Wed, 13 Jul 2016 16:49:49 +0000 (16:49 +0000)]
Merge "Upgrade ietf-{inet,yang}-types to 2013-07-15"

7 years agoFixed check-style error caused by odl parents check-style patch 83/41683/1
Anil Vishnoi [Mon, 11 Jul 2016 22:42:55 +0000 (15:42 -0700)]
Fixed check-style error caused by odl parents check-style patch

Odl parent merged following patch to enable check-style for
generic exception:
https://git.opendaylight.org/gerrit/#/c/41304/

That broke OVSDB because OVSDB project has check-style enabled locally

Change-Id: I2c1a8b162fb79e033b4c833f1f12cb402477cb0e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
7 years agoUpgrade ietf-{inet,yang}-types to 2013-07-15 20/40820/2
Lorand Jakab [Thu, 23 Jun 2016 23:07:50 +0000 (18:07 -0500)]
Upgrade ietf-{inet,yang}-types to 2013-07-15

Change-Id: I2a8143ec58e9c2b174fe532d7d65e8f198f3ea78
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
7 years agoMerge "Fix potential future problems re. hidden fields"
Anil Vishnoi [Fri, 8 Jul 2016 03:55:22 +0000 (03:55 +0000)]
Merge "Fix potential future problems re. hidden fields"

7 years agoFix potential future problems re. hidden fields 11/41311/2
Michael Vorburger [Mon, 4 Jul 2016 22:49:50 +0000 (00:49 +0200)]
Fix potential future problems re. hidden fields

None of these changes actually really change code semantics, it does
what it does today, but is hopefully clearer.

Found by Checkstyle.

Change-Id: Ie8a231a9d203ed911c0ea3d9f41eec225af6f270
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
7 years agoCheckstyle clean-up src/test/java of southbound-impl 66/40966/5
Michael Vorburger [Tue, 28 Jun 2016 20:58:30 +0000 (22:58 +0200)]
Checkstyle clean-up src/test/java of southbound-impl

Change-Id: I4646877449a09d85779d35e85ce565a620818435
Signed-off-by: Michael Vorburger <vorburger@redhat.com>