Merge "Model update to add external-id to port/interface."

Merge "Add break in iteration over vlan tags for a given ovsdbTerminationPoint"

Fix: bug wherein the bridge with name having a - cannot be created. e.g. br-int cannot be created

Change-Id: I620f8255100fdfcd9cef57a926280c58520d76fa
Signed-off-by: Prateek Garg <prategar@cisco.com>

Add break in iteration over vlan tags for a given ovsdbTerminationPoint

Since we expect no more than a single vlan tag for a given termination point,
there is no need to call setVlanTag multiple times on termination point builder.
Added a TODO to mark the fact that the iteration/builder will need to be enhanced
if more than a single vlan tag support is needed.

Change-Id: I1ff45ccea8fb2b061157ca7b9af0ad2e072abdcb
Ref: https://gist.github.com/1e07ddc7e663710c2ac7
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

adding Interface type for dpdkvhostuser interfaces in yang and southboundConstants

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

Fix bug when a bridge is removed.

The external_ids opendaylight-iid was not being used
for bridge remove.  Now it is.

Change-Id: I2cde45a07f255bbc5f1efb7d2c3b1bd2b63f98f5
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Fix for case when datapath/iface types are not supported

If we attempt to get datapath/iface types from ovs
versions prior to their support, an exception is thrown,
this patch handles it correctly.

Change-Id: I8315bf3a2f250c412cdf51c385754be409dc2257
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Merge "Revert "Added trunks code to go with the model.""

Revert "Added trunks code to go with the model."

This reverts commit 436e0cbe741db71cd645bda565a7a83a8f722cad.

Change-Id: If9ba1d0c7ef7a30d6d0aef3575e240f52a180780
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

Model update to add external-id to port/interface.

Change-Id: I099111e7ef09428516473ad4fb998d88835e321c
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Merge "Added trunks code to go with the model."

Revert: Revert "Add JUnit testing for ConfigurationServiceImpl class."

This commit re-introduces commit eb362a3e296c10ad8ac7b5cb626cd2466f4d558b.

The issue was a minor tweak missing in pom.xml, so that powermock would
stop generating npe.

Change-Id: I4b3b7aa6fa8a597a3d0d84e648e2c0dd21038c68
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Also-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Revert "Add JUnit testing for ConfigurationServiceImpl class."

This reverts commit eb362a3e296c10ad8ac7b5cb626cd2466f4d558b.

This is to stop regression introduced, where hit the following failure:

https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-daily-full-integration/OVS_VERSION=1.9.0,jdk=openjdk7,nodes=dynamic_docker/23/consoleFull

apiTests(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)
Tests run: 3, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 53.545 sec <<< FAILURE! - in org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT
testInventoryListeners(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)  Time elapsed: 10.368 sec  <<< ERROR!
java.lang.NullPointerException: null
at org.mockito.internal.exceptions.stacktrace.StackTraceFilter.<clinit>(StackTraceFilter.java:21)
at org.mockito.internal.exceptions.stacktrace.ConditionalStackTraceFilter.<init>(ConditionalStackTraceFilter.java:17)
at org.mockito.exceptions.base.MockitoException.filterStackTrace(MockitoException.java:30)
at org.mockito.exceptions.base.MockitoException.<init>(MockitoException.java:19)
at org.mockito.exceptions.misusing.MockitoConfigurationException.<init>(MockitoConfigurationException.java:18)
at org.mockito.internal.configuration.ClassPathLoader.loadImplementations(ClassPathLoader.java:145)
at org.mockito.internal.configuration.ClassPathLoader.findPluginImplementation(ClassPathLoader.java:110)
at org.mockito.internal.configuration.ClassPathLoader.findPlatformMockMaker(ClassPathLoader.java:106)
at org.mockito.internal.configuration.ClassPathLoader.<clinit>(ClassPathLoader.java:59)
at org.mockito.internal.util.MockUtil.<clinit>(MockUtil.java:21)
at org.mockito.internal.MockitoCore.<init>(MockitoCore.java:40)
at org.mockito.Mockito.<clinit>(Mockito.java:932)
at org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT.testInventoryListeners(OvsdbPluginIT.java:171)

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

Added trunks code to go with the model.

Change-Id: I514f8d8ad7d786901061b14909735cee9bb412f6
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

Add <relativePath/> to ensure Maven pulls artifact from Nexus

Needed by autorelease to be able to find and replace this value
prebuild.

Change-Id: Ifad9a6c514c2aa47e52d18ebbfeb1bf71b121496
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Small fix to insure correct running offline.

The southbound-impl features depend on the config file, not
just on the southbound-impl bundle.

<groupId>org.opendaylight.ovsdb</groupId>
<artifiactId>southbound-impl</artifactId>

is the *bundle* dependency.

<groupId>org.opendaylight.ovsdb</groupId>
<artifiactId>southbound-impl</artifactId>
<type>xml</type>
<classifier>config</classifier>

is a distinct artifact for the config file.

By failing to depend on the config file, the
southbound-impl feature will not work correctly in
offline mode.

Change-Id: Iab4ba7225f30aac19b45267da33c3a6219488b4a
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Merge "Add datapath types to vswitch."

Merge "Add multiple options to port via MDSAL"

Add multiple options to port via MDSAL

Only one option was getting added to the port when
multiple options were supplied in the MDSAL config
operation.  This patch adds all of them to the
port.

Change-Id: Iee139510d6d396c410641130b5aeee1fedca4c72
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Allow port to be added via MDSAL without VLAN tag

Check if VLAN tag was provided before trying to add
it when creating a port to prevent a null pointer exception.

Change-Id: Iac0582ee5e151e446383130d108ef8c0e182f34d
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Use dependencyManagement imports

Some upstream projects already provide artifacts, so use them to
simplify poms.

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

Merge "Remove port/interface from operational datastore."

Merge "Enabled the use of opendaylight-iid as external_ids for bridges"

Merge "Add ability to serialize/deserialize iids to/from Strings"

Enabled the use of opendaylight-iid as external_ids for bridges

Change-Id: Ie95bedab4fc0bc367e0581a64c1084c807bd390c
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Add ability to serialize/deserialize iids to/from Strings

Change-Id: I17df9cb64f53f7084bf439b4d6ae2203af8a2e19
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Merge "Add JUnit testing for ConfigurationServiceImpl class."

Added code for vlan-tags on termination points.

Change-Id: Id57d5b157e505a1b6a73cb8b32022be0d64e4d2b
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

Add JUnit testing for ConfigurationServiceImpl class.

I had to add dependency to PowerMockito in the pom file in order to mock final class and static method.

Change-Id: Ib5de1a79acc78b4c42e27cbcbbc9e137fa963b46
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Merge "Fail build on checkstyle errors"

Merge "Added trunk model."

Add datapath types to vswitch.

Change-Id: If19b5d42361b1af291d79ec3f83920a97a16981e
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Fail build on checkstyle errors

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

Remove port/interface from operational datastore.

Change-Id: Id28b6129de6879d3e9b2b141ae801ba0741bdb7e
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Remove uneeded version property from distribution pom

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

Updates due to using latest checkstyle

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

Use latest checktyle version

Some generics warnings were fixed in the latest version.

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

Update libary with checkstyle corrections

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

Use local checkstyle rules to allow incremental corrections

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

Added trunk model.

Change-Id: I81270948e49f291c5d8927a64c3b5466cd9d02c5
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

Update doc of class EventDispatcherImplTest.

Change-Id: Ib781c519f2be1e99764de1358c0ab087f77cb36b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Merge "Added vlan-tag to port-interface (wip)."

Small fix to model

Change-Id: I705c29b42887c10e05f97e02717abfb99a4697a5
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Fixed interface options attribute model. Replaced single string value to key-value pair

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

Merge "Update OpenVSwitch schema to include new datapath and port types."

Added vlan-tag to port-interface (wip).

Change-Id: Iccd6eefb10da36225c0f981b71d64a09865aa003
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>

Merge "Add JUnit testing for EventDispatcherImpl class."

Add JUnit testing for EventDispatcherImpl class.

Change-Id: I4b382bb681af4e6d805094666657d81688166b9d
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Interface ofport and ofport_request support

Added support to yang model for ofport and ofport_request.  These fields are
settable at the time of endpoint creation.  Changed the Interface schema ofport
field to utilize the type Integer; ofport is defined as an integer in the
Open_vSwitch specification.  Changed references to Interface ofport column to
use Integer data type.  Enforced a Yang model range for ofport_request to
ensure the value is in the range [1,65279] as defined by the Open_vSwitch
specification. Future work will persist these settings to the data store.

Change-Id: Ic8f1bab8d8fefe6b102cfceb50ba74f8cfa0b9b7
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

Merge "Add JUnit testing for ProviderNetworkManagerImpl."

Merge "Bug2901: Fix Inventory ofport_request column in schema"

Add JUnit testing for ProviderNetworkManagerImpl.

Change-Id: Ie195e64d2e6f80fea11dee7ea6bfc1d3635567da
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Bug2901: Fix Inventory ofport_request column in schema

Fixes ofport_request column setter.  Open_vSwitch defines ofport_request as an
integer, not a String.  The setOpenFlowPortRequest() method was modified to
take Set<Integer> instead of String.

Change-Id: I95e4a015aa53015fee2a9802e4f034951bed2b47
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

Update OpenVSwitch schema to include new datapath and port types.

This update includes OVS schema changes made in http://openvswitch.org/pipermail/dev/2015-March/052794.html
These changes were made to OVS to include DPDK datapath and port types.

Change-Id: Ic45c60b91666f19d993df0bcd3049ca727d43d89
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Merge "BridgeRemovedCommand"

Add copyright to SecurityServicesImplTest and VlanConfigurationCacheImplTest

Change-Id: Ifd7ab76ce7e72eecb0707cb65c63737c43450e1d
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Merge "Add JUnit testing for SecurityServicesImpl class."

BridgeRemovedCommand

We can now delete bridges

Change-Id: I2c89b65c5410172cdb4f5e103bfa0da5b6ab8915
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Add JUnit testing for SecurityServicesImpl class.

Change-Id: I9fa3af98acc89d4ea10764f573c0bcc2050f0e09
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Merge "Allow   port/interface creation via MDSAL without supplying options"

Merge "Add JUnit testing for VlanConfigurationCacheImpl class."

Merge "Add JUnit testing of TenantNetworkManagerImpl class"

Added version leaf to ovsdb-node-attributes of type yang::uuid

Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
Change-Id: I51b913cd6be634f240e158334715e150da4b4bf0

Add JUnit testing for VlanConfigurationCacheImpl class.

Change-Id: Ia29f89d8e2bc68da6d6dbcd4e7c4587918e3776a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Add JUnit testing of TenantNetworkManagerImpl class

Change-Id: I305ddb0dbdea8b214ed7dcd041ac9f2d585bb9db
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

Add the bridge datapath_type to the operational MDSAL

Update the operational MDSAL with the bridge datapath_type.

Change-Id: I68664746daf771535c5bc157badb4e216e62aba4
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Merge "Updated postman collection with port/interface creation  related restconf requests"

Allow   port/interface creation via MDSAL without supplying options

Allow a port/interface to be created if the options are not supplied
in the MDSAL config request.

Change-Id: I25dd62d30708bd67d7bb2bd9f49b750e1eb9f1f2
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Removed termination-point reference list from bridge-arrtibutes

Termination point reference is not required becuase termination point attributes will be augmented on the brige node itself.

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

Updated postman collection with port/interface creation
related restconf requests

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

Define Models for Port/Interface attributes and implemented
port/interface create operation to configure port/interface
on the ovsdb managed bridge. This patch only enables creation
of port/interface with optional inputs.

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

Add dpdkvhost interface type

Add the dpdkvhost interface type to the list of
OVSDB interface types in the SB model.

Change-Id: I29b1dee8edbaf6ed167d002102c97c19907c04bf
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Changed tp to terminationpoint to make it look meaningful and appropriate

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

Merge "Add bridge port when creating a bridge via OVSDB SB MDSAL"

Add node callback to flow capable listener from ovsdb southbound

Use Bridge events in the ovsdb southbound to callback into flowCapableListener.
This callback can be used together (or instead of) the mdsal callback. Also,
protect the nodeCache by using a synchronization object.

Patch 2 (code review):
  - Use Constants.OPENFLOW_NODE_PREFIX instead of duplicate internal copy
  - Make code consistent when removing node form local cache (sync access)
  - Remove check for dpid value (not needed)

Patch 3 (Sonar issue):
  - No need to check for null before an instanceof; the instanceof keyword returns
    false when given a null argument.

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

Add bridge port when creating a bridge via OVSDB SB MDSAL

When a bridge is created via SB MDSAL, also create the
associated internal port and interface.

Change-Id: I4d942b52611c1c444e811bfdea05d4eaa45996d5
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Merge "Update ovsdb model to support DPDK ports and datapath types"

Merge "Changed the constant name logger to LOGGER to comply with the naming convention"

Update ovsdb model to support DPDK ports and datapath types

This patch removes dpdk.yang and datapath-port-types.yang in favor of a simpler change to ovsdb.yang

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

Changed the constant name logger to LOGGER to comply with the naming convention

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

Add other interface types to OVSDB SB MDSAL

Fill out the list of OVSDB interface types.

Change-Id: Idb838ed1498b0ce74639b5509a8ed39ccf79c776
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Merge "Support writing datapath_type to OVSDB bridge in SB MD-SAL"

Change listener registration to Operation Data Store and DataChangeScope to Base

Changing data change listener registration from config data store to operational
data store, because when ovs node connects to controller inventory manager write
node information to operational data store. I changed the scope of DataChange
from ONE to BASE, because with ONE we are receiving flood of DataChange events,
because of statistics manager write operation to operational data store.

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

Merge "Patch to update interface in operational datastore."

Merge "Add proper response extraction to allow assertEquals"

Cleaned up excessive logging at INFO level.

Some INFO level logs crept in at places that are completely
natural during dev... but not OK long term ;)

I pulled those back to debug level.

Please note, some INFO logs that are probably long term non-appropriate
*where* left in the termination-point stuff, because I presume they
are still helping the folks working on that... we should eventually
fix those to, but when the time is right :)

Change-Id: I5d0fc76096bea701a0c40ec803d574114fa453d5
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Support writing datapath_type to OVSDB bridge in SB MD-SAL

Add 'system' and 'netdev' datapath_types to the model to allow
creation of userspace (netdev) bridges via the OVSDB SB MDSAL.

v2 - remove tabs
v3 - resolve comments (return "system" by default")
v4 - rebase
v5 - remove white space
v6 - rebase

Change-Id: Ic6ccef1c3943c961e29b3ab7c605e5e8c0e1e42f
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Patch to update interface in operational datastore.

This patch adds interface updates to ovsdb operational datastore.

Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Change-Id: I1fdd77382de1b9c3ee99304598d52dd3b3ed8ac8

Add proper response extraction to allow assertEquals

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

Merge "Return only the Identifier and not the whole Node object"

Merge "Added support for fail-mode."

Return only the Identifier and not the whole Node object

The northbound should only return a string like "OVS|192.168.120.1:6640" when returning Node information. In the migration work the mdsal Node.fromString() returns all the Node object information and not just teh identifier as the adsal Node did.

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

Added support for fail-mode.

Supports both write of fail-mode to config, and also
read of it from operational data-store.

Also updated postman collection

Change-Id: Ie730122f525e6747dfe5e765bd317b95775cd256
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Minor: minor edits and remove deprecated call for InstanceIdentifierBuilder

- Make code more readable by removing unecessary class specifiers
- use .build() instead of InstanceIdentifierBuilder.toInstance()

Patch 4, code review:
- move instance creation of flow and node to common functions

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

Postman collection for OVSDB Southbound

Patch 2: Change the file contents so that everything is not in a single line.

Change-Id: I5e786a537200705dfe6fd8b983c97a4c83bb6c8b
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Implement NodeCacheListener to SouthboundHandler

- implemented the NodeCacheLister for SouthboundHandler
- changed FlowCapableNodeDataChangeListener to use the NodeCacheManager
- modified Activator to include the interface
- moved the low frequency logs to info level, moved high-frequency to trace

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

Add class name to log for better debugging

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

Fix toString for different events to avoid NPE

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

Merge "Patch to bring us into alignment with skip.karaf.featureTest from odlparent"

Add controller to bridge

You can now write controller info to a bridge and
read it back in the operational store when it comes
back from ovsdb.

Change-Id: I6f7b7b53201da053605fe965908a00785651e46e
Signed-off-by: Ed Warnicke <eaw@cisco.com>