Merge "Maven cleanup and features-parent migration"

Merge "Added code for PhysicalPort, LogicalSwitch"

Merge "Added support to update flows for induvidual security rule add/remove , after the SG is associated with a port."

Merge "Use MD-SAL events to react to OVSDB changes"

Merge "SouthboundIT: merge the CRUD tests methods"

Maven cleanup and features-parent migration

Use features-parent {{VERSION}} to allow dropping a number of Maven
properties.

Upgrade commons-collections (1.0 -> 3.2.1) and httpcomponents (4.2.1
-> 4.4.1).

Drop a number of obsolete components from dependency management
(controller:commons.northbound, controller:containermanager,
controller:forwardingrulesmanager, controller:sal,
controller:switchmanager.

Use odlparent-provided versions of commons-lang3, most netty
components, and the equinoxSDK381 components.

Drop obsolete io.netty:netty:3.8.0 dependency (replaced by
io.netty:netty-all in versions 4+).

Remove some duplicate dependency declarations.

Use "<relativePath/>" instead of "<relativePath></relativePath>" now
that it's safe to do so (the auto-release scripts handle it).

Change-Id: I62a385ba49d79e045934ec706f69313425553ae0
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts

Change-Id: Ie9110ebcfb7412015c171e0add5faa89ecd5d293
Signed-off-by: Sam Hague <shague@redhat.com>

Added code for PhysicalPort, LogicalSwitch

1. Added PhysicalPortUpdate and PhysicalPortRemove
2. Added LogicalSwitchUpdate and LogicalSwitchRemove
With these changes physical-port and logical-switch changes on device are
reflected in OperationalDS.

Patchset2:
1. Rebase
2. Add VlanBindings to OperationalDataStore
3. Use env vars for IPs in postman collection
4. Fixed a bug in postman collection

Change-Id: Ic1b3d0e15088db6d81316ad88c2db5299a9c9be0
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

Merge "Listen config DS then push configuration to switch"

Merge "Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts"

Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts

Change-Id: Iccc0c5d817db0014842f5e7023b173c67af728e2
Signed-off-by: Sam Hague <shague@redhat.com>

Listen config DS then push configuration to switch

Patch Set 1:
1. Add skeletal code for command pattern to push configuration to switch, function TBD.
2. Implement LogicalSwitchUpdateCommand.

Patch Set 2:
1. Fix whiteapce issues.
2. Add 'logical-switch-managed-by' for logical-switch-attribute in hwvtep.yang.
3. Use hcm.getConnetionInstance(node) added in https://git.opendaylight.org/gerrit/#/c/29599.

Patch Set 3:
1. Fix LOG severities and delete some TODOes.
2. Use HwvtepSchemaConstats.databaseName for Hwvtep database name.

Change-Id: I0fe5dafdf9ecfa91ee8c757c4b694a50e6cbed35
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>

Merge "rework sfc flows 2"

Merge "Patch Set 1: Add postman collection for HwvtepSouthbound"

rework sfc flows 2

Change-Id: I9cb93d19d54cd7bcf7d93ab82e17dbe7579cafb3
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Security Groups: Added support for ICMP, ALL ICMP and Others protocol Change-Id: Iedc3061ccaf03f21b9a39da8a4b8b27c4baea6f0 Signed-off-by: raveek <raveek@hp.com>"

Merge "Fixed possible null point exception in node manager entries update code"

Patch Set 1:
Add postman collection for HwvtepSouthbound

Patch Set 2:
Add brief introduction in README

Patch Set 3:
Change to multi-line version

Patch Set 4:
Fix whitespace issues

Patch Set 5:
Fix whitespace issues: a trailing space missed

Patch Set 6:
recheck

Change-Id: If7a764ca56ced4316aa04ff8538bf12849d60dd9
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>

Merge "add rsp option"

Merge "added getConnectionInstance by Node"

add rsp option

Change-Id: Idd0410436861ccc13ad581e42e75ea793102e3ad
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "UT for remaining classes in ovsdb.southbound.ovsdb.transact"

Merge "Declare expected exceptions"

Merge "Avoid logging stacktraces for schema version mismatches"

Fixed possible null point exception in node manager entries update code

Change-Id: Iac231117e592f23c6e1362b71e76ae13d6c98a40
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "Bug 4611: null pointer exception while processing interface event"

For controller initiated connection, there is race condition
while disconnecting the device from controller, that does
not allow one of the non-owner southbound instance to disconnect
the device from the plugin. Race condition was occuring because
OvsdbConnectionInstance was not stored in the internal cache
at correct point in control flow.It gets added when EntityOwnershipChange
event happens, so when data change event for disconnection occured,
it requires OvsdbConnectionInstance to be in cache to disconnect
from the device, but OvsdbConnectionInstance was not in the cache
becuse EntityOwnershipService event was not recieved by that non-owner instance.

Conflicts:
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java

Change-Id: I3861b5f2907d08709a3bd1aa4f4ecfbfd444351d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "rework sfc flows"

rework sfc flows

Change-Id: I1789ce135a8b08de4c4321fdd69cec73bc4a638c
Signed-off-by: Sam Hague <shague@redhat.com>

added getConnectionInstance by Node

This is required for https://git.opendaylight.org/gerrit/#/c/29575/

Change-Id: Iceab17399b973dab7c1fbf47d21af6989aa2f49e
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

Merge "workaround for sfc part 2"

workaround for sfc part 2

Change-Id: Ib733682492ede0985dae97bbe3add80b359add1f
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "add rest of sfc flows"

add rest of sfc flows

Change-Id: I44629e889705c4e7f6a21c3655addee9670bc8c5
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "workaround for sfc"

workaround for sfc

Change-Id: I46b22b084627f95c1e478b1cf004681d21d4595c
Signed-off-by: Sam Hague <shague@redhat.com>

Bug 4611: null pointer exception while processing interface event

Acl service needs to handle cases when port security info is not available.

Patch set 2: add unit test

Change-Id: I788d31e4f0001fcf70caa59086d432b01178de1b
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Avoid logging stacktraces for schema version mismatches

Change-Id: Ic3db3d3526491bb488d396be64adc9e41e09a3d6
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Declare expected exceptions

@Test supports declaring (and verifying) expected exceptions, let's
use that instead of manually detecting the exceptions.

Change-Id: Iafe26c2c566ebdfe7616a864d5e6c60d3b2b7fe2
Signed-off-by: Stephen Kitt <skitt@redhat.com>

UT for remaining classes in ovsdb.southbound.ovsdb.transact

Change-Id: I7dfd78209e770c28a7ced22cea9308c5c9fe7ee8
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>

Added support to update flows for induvidual security rule add/remove ,
after the SG is associated with a port.

Change-Id: I88d485bb0725909f00b1bc8d48ef17705a8fc695
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>

Use MD-SAL events to react to OVSDB changes

Instead of just waiting after creating or deleting the OVSDB MD-SAL
node, wait for the corresponding event in the operational database.
This actually saves time in most cases (since the round-trip takes
less time than the static wait), and avoids failing tests
unnecessarily when the round-trip takes longer than expected. There's
an overall timeout to make sure we don't hang the test completely.

For now this only handles connectOvsdbNode() and
disconnectOvsdbNode(), but the stage is set for other MD-SAL
manipulations to be processed in the same way.

This isn't multi-threadable as-is.

Change-Id: If1279054f38192bed007d83f9fda981dc0c466f1
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SouthboundIT: merge the CRUD tests methods

We use two variants, one for plain bridges, the other for termination
points.

Change-Id: I986d93c65cc90a37eaf0036ff93a0e4148ba030c
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Security Groups: Added support for ICMP, ALL ICMP and Others protocol
Change-Id: Iedc3061ccaf03f21b9a39da8a4b8b27c4baea6f0
Signed-off-by: raveek <raveek@hp.com>

Merge "Added command patterns to update OperDS"

initial framework for sfc workaround and IT tests

Change-Id: I94a4a40659fb4f0a1ecc815a7d132ffcadd991de
Signed-off-by: Sam Hague <shague@redhat.com>

update exports for ServiceHelper

Change-Id: I7d7e97b5860dbaca87877d95759fe550a62855e8
Signed-off-by: Sam Hague <shague@redhat.com>

Add config for selecting provider

Change-Id: I5597573fa2cafd2e7db4d444fc51030adf478f7c
Signed-off-by: Sam Hague <shague@redhat.com>

Rework provider interface to allow different providers

Change-Id: Iaa36bc040e82005c3a8d419e23ad9ac8696c1215
Signed-off-by: Sam Hague <shague@redhat.com>

Add SfcClassifier to pipeline

Change-Id: I7de504449435678020efc3aca290897adada42ab
Signed-off-by: Sam Hague <shague@redhat.com>

Merge changes I4a8650ae,Ie2e119fd,Ic2acced7,Ieeb5ae5b,I2f7b6f8f

* changes:
  Fixed wildcarded imports
  Fixed NPE in md-sal secutiry groups to neutron security group conversion.
  Removed Flow id caches that is being used to check
  Populate the Node Cache at the controller start/restart.
  Repopulate router, port and floating ip related caches These caches can create a problem in a cluster environment where node goes down and rejoin the cluster. All the caches will be clear on restart, and if newly join node become master instance, it can break the functionality. This patch is re-populating all the required caches

Fixed wildcarded imports

Change-Id: I4a8650aefddd0455e55d005a2ffd017a34d64293
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Fixed NPE in md-sal secutiry groups to neutron security group conversion.

Change-Id: Ie2e119fdc24168f2ab4df26332244586c644912f
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Removed Flow id caches that is being used to check

if flow is already installed or deleted. Now it will
install flow irrespective of whether the flow already
installed or not. It won't really do installation of
flow again, because if you write same data again, it's
going to be no-op. These caches create issues if new node
with same ovsdb ip:port connects the controller, but the
openflow bridge is different.

Change-Id: Ic2acced7a9a006e6e04afba6fea22aaf0620f134
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Populate the Node Cache at the controller start/restart.

This cache can be removed fully, but if we do that, we need
to make read call to the data store, where we will have to
read the whole topology tree, that can put some load on the
md-sal data store, and it might not be negligible in case of
clustered data store.

Change-Id: Ieeb5ae5ba01839b34aefe7d3916c6bdd0fb14808
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Repopulate router, port and floating ip related caches
These caches can create a problem in a cluster environment
where node goes down and rejoin the cluster. All the caches
will be clear on restart, and if newly join node become master
instance, it can break the functionality. This patch is re-populating
all the required caches

Change-Id: I2f7b6f8f8871eb7c6fc7c96d9e4e121adbf5c950
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "Fix the feature name of hwvtepsouthbound in ./hwvtepsouthbound-karaf/pom.xml"

Merge "Extend southbound-it testDpdkSwitch() to test all the OVS-DPDK interface types [dpdk,dpdkr,dpdkvhostuser..]"

Added command patterns to update OperDS

1. Command pattern for Global and PhysicalSwitch
2. Update OperDS with Global and PhysicalSwitch tables

Patchset2:
Added skeletal code more command pattern classes, functionality TBD.
Handle updation of instance iid on connect/connected

Patchset3:
Clear Operational DataStore when switch disconnects
Add PhysicalSwitchRemove command

Change-Id: I519c28a59edcd3a99ac5fadfda420b65edb85abb
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

More changes for SFC

Change-Id: I1e6b52b9726d6fe85ccde01a57bdb927821690ca
Signed-off-by: Sam Hague <shague@redhat.com>

Fix utils exports

Change-Id: I0032fd368af59e23cecb26736b0e34723df58a0f
Signed-off-by: Sam Hague <shague@redhat.com>

Modify NSH MatchUtils

Change-Id: I85057e96b399dea8d9f09d087da6014dc780ac8c
Signed-off-by: Sam Hague <shague@redhat.com>

Add Flow utils

Change-Id: I120391618945908c358c4da4728ad0c5243c721f
Signed-off-by: Sam Hague <shague@redhat.com>

Fix the feature name of hwvtepsouthbound in ./hwvtepsouthbound-karaf/pom.xml

Change-Id: I994bc48981ec43cf206e07a9ac877ed1e356fe92
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>

Extend southbound-it testDpdkSwitch() to test all the OVS-DPDK interface types [dpdk,dpdkr,dpdkvhostuser..]

Change-Id: Iab6532b33fe1d2eb0ab61c1434e9560fdb7b530f
Signed-off-by: Praveen Mala <praveen.mala@intel.com>

Merge changes If2ef6c5c,I4b8e0a28

* changes:
  Fix nsh flow
  fix for missing sfc feature

Fix nsh flow

Change-Id: If2ef6c5c6986ca42e7a753a1e43202dd5cb4bfcc
Signed-off-by: Sam Hague <shague@redhat.com>

fix for missing sfc feature

Change-Id: I4b8e0a28c3dcca1f2809ca820f77be479dbe236c
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Use config for hwvtepsouthbound"

Use config for hwvtepsouthbound

This is counterpart to https://git.opendaylight.org/gerrit/27578

Patchset2:
Remove null check for ovsdbConnection in handleOwnershipChange. Since this
is always non-null, we end up not starting OVSDBManager for hwvtep.

Change-Id: I8900794cf4f75b837fd6efb406f18addc9cfe3a0
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

UT for ovsdb.southbound transact package

4. TerminationPointCreateCommand.java
5. TerminationPointUpdateCommand.java

Change-Id: I7647196548b676ada6a4fa902f60f7e71644901c
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>

Inline variables

Change-Id: I7999f158b755eb9b0a71bd38d3e065cc766f45a7
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Drop redundant type information

Change-Id: I030f911f2e699266b6f85af7a0185a4714e34fb1
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Fix up loops

Use foreach loops instead of explicit Iterators.
Use switch statements instead of mutually-exclusive if statements.

Change-Id: I2239a2f119686efc65ae062a95b4edbda99c5ded
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Boxing/unboxing clean-up

Change-Id: I9c0b9386a5befc58e0a93ad654e9fb8a8531e7bd
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Full <> clean-up

Change-Id: I23ce78b0cb4d2f253bc2d0ea8fe4833ff099e8b2
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Remove unused imports

Change-Id: Icdbeac2764322aebe8c903b5cc23fa3295b61d49
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Remove redundant semi-colons

Change-Id: I4a9d36022a333d90c2b3fc716d9aca9334c15a66
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Drop redundant "public" for interfaces

Change-Id: I5761423745aa72adc7434f82e9ed076d842e2ddc
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Clean up enums

enums are static, and their constructors private, by default.

Change-Id: I6be729d10fa2e81b87a5a4afcc91ed1a30e3ea97
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Clean up collections

Use interfaces instead of concrete implementations where appropriate.
Use the Java 7 <> operator.
Avoid Lists.newArrayList() if new ArrayList<>() is sufficient.

Change-Id: I70ebe6ebc7c79f8d742fdd71fc6419461a7aaa65
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Use SLF4J instead of printStackTrace()

Change-Id: I0bcf68f963cdbaaac5de3e919c14134d2420ef35
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Merge "Add back the proper NetvirtSfc flows"

Add back the proper NetvirtSfc flows

Change-Id: I26fe692c95b14c8b4baa7aa575a233feb4337914
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Ovsdb-UI : Change icon and attempt to fix invisible vxlan"

Merge "Added support for remote security group update. 1)When a new port is created/deleted with a security group, all the ports which has that security group as a remote security group, will be updated. 2)Refactored IngressAclService,EgressAclService for supporting remote security group update."

Merge "Add DataTreeChangeListener, user connections"

SouthboundIT: merge the test generation code

Change-Id: I86354ce41a78749578e93827e35dc23659e1588d
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SouthboundIT: use a common builder for the input values

Change-Id: I7af0b37eda67554ce28cbcabae16fcf62260432b
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SouthboundIT: drop test case 4

As implemented, test case 4 is equivalent to test case 3. Modifying
test case 4 so it matches the documentation (i.e., setting the value
but not the key) just causes errors in MD-SAL because key-less values
are not allowed. This patch drops test case 4 entirely.

Change-Id: Id52eeddd1c7a1660a1da3ce82e31ac7295bff635
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Avoid an NPE in OvsdbNodeRemoveCommand

In some cases (perhaps only test code)
ovsdbNodeAugmentation.getManagerEntry() returns null; this patch adds
a test to avoid the resulting NPE.

Change-Id: If545d3e4478deb91703029d8226957c5c61d2125
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SouthboundIT: make the tests uniform

All the CRUD tests should be similar; fix all the NPE handling and
adjust the tests so they are all used. This is a precursor to merging
all the tests using helper classes.

Change-Id: Ie616bed00304ddc780b85f0bd0d0f550bb4645f2
Signed-off-by: Stephen Kitt <skitt@redhat.com>

SouthboundIT: use an explicit class describing test-cases

Change-Id: Ice5b8e281465be6bcf733ceafa6dbe673eb8f35c
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Revert SouthboundIT multi-threading and refactor

Running the tests in ExecutorService-managed threads masks a number of
errors which leave the target OVSDB in an inconsistent state. This
patch reverts the multi-threading and subsequent refactor, while
preserving some of the later changes (notably the Jacoco activation).

The multi-threading and testcase-refactoring will be re-done as
follow-up patches.

Change-Id: I9d534509f772afd75877d230cf4e2dc4654fab85
Signed-off-by: Stephen Kitt <skitt@redhat.com>

Merge "Fix netvirtsfc flows"

Fix netvirtsfc flows

Change-Id: Ife49b9150dcb99fb3097b0fe175d8e9355bdf527
Signed-off-by: Sam Hague <shague@redhat.com>

Ovsdb-UI : Change icon and attempt to fix invisible vxlan

- Change the icon for ones more appropriate.
- Attempt to solve the invisible vxlan when using
a "triange" vxlan topology.
- Change the logical dialog to be "half-static".
The position will be set one time and will keep the
last given instead of trying to appear near the related node.

Change-Id: I1bdd92a5b97c9f8638c5415391c02f3deb6d168a
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>

Bug 4546 - Southbound plugin throws java.lang.IllegalStateException
 while shutting down and loops forever

Change-Id: I71812a3cb008e43cfa5b0f9ce331fb2623983332
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Added support for remote security group update.
1)When a new port is created/deleted with a security group, all the
ports which has that security group as a remote security group, will be
updated.
2)Refactored IngressAclService,EgressAclService for supporting remote
security group update.

Change-Id: I16e83f77f3ccc19a4d5ecd800e39881643ec752a
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>

Merge "UT for ovsdb.southbound transact package"