Merge "OVSDB netvirt southbound - set correct datapath type for OVS with DPDK"

Merge "Enable SLF4J logging in tests"

OVSDB netvirt southbound - set correct datapath type for OVS with DPDK

When creating bridges from netvirt, check if the OVSDB node supports
'dpdk' interfaces.  If it does, then specify the datapath type
so that the bridge will be created with the 'netdev' datapath type.

Change-Id: Ida76d51906238339255f8e02424328de62a420d7
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
(cherry picked from commit 6989a273149b5908fb2c2ae56d8f9fdb01cd05e0)

Merge "Mention "fig up" and sudo for integration tests"

Slight improvements to our UTs

NetworkHandlerTest: explicitly split shared/non-shared testing instead
of relying on successive calls to isShared() (this avoids the test
being too closely linked to the implementation: the test only works if
the code calls isShared() in the way the test expects). Likewise for
isTunnel().

EventDispatcherImplTest:
* the event dispatcher is started by its constructor, no need to start
  it explicitly;
* specify a handler type in the mock event to avoid crashing the event
  handler;
* instead of "assuming" the event size (which was always wrong since
  the events were consumed before we got to the end of the test),
  check that the events were dispatched as appropriate.

ServiceHelper:
* in getGlobalInstance(), avoid an ArrayIndexOutOfBoundsException
* check for a null bundle explicitly; this avoids the tests causing a
  NullPointerException and producing error logs (and it also means we
  can log actual errors with more detail).

ServiceHelperTest: split the null/non-null tests so that we don't rely
on the implementation's calling pattern to getBundle().

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

Merge "Clean up ConfigActivator"

Enable SLF4J logging in tests

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

Merge "Enable cancel monitoring"

Mention "fig up" and sudo for integration tests

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

Merge "Fix description for OUTBOUND_NAT Table: "DNAT for outbound floating-ip traffic""

Merge "BUG #4029 : null pointer exception at NeutronL3Adapter.java:251"

Merge "netvirt: use setID/getID to catch up neutron northbound change"

Fix description for OUTBOUND_NAT Table: "DNAT for outbound floating-ip traffic"

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

BUG #4029 : null pointer exception at NeutronL3Adapter.java:251

port update event doesn't always include fixed ips.
Thus NeutronPort.getFixedIPs() may return null.
This patch adds null check.

reproduce procedure:
- create network
- create subnet
- create port
- update port without fixed ip

Example requests are follows

---
POST /controller/nb/v2/neutron/networks HTTP/1.1

{
  "network": {
    "name": "tempest-test-network--1116013201",
    "provider:physical_network": null,
    "admin_state_up": true,
    "tenant_id": "0dde8d3f09764e849d19f0550ef11b26",
    "mtu": 0,
    "router:external": false,
    "shared": false,
    "vlan_transparent": null,
    "port_security_enabled": true,
    "provider:network_type": "vxlan",
    "id": "82953a35-0554-48e4-9ace-200a93ad88df",
    "provider:segmentation_id": 1092
  }
}

---

POST /controller/nb/v2/neutron/subnets HTTP/1.1

{
  "subnet": {
    "name": "",
    "enable_dhcp": true,
    "network_id": "82953a35-0554-48e4-9ace-200a93ad88df",
    "tenant_id": "0dde8d3f09764e849d19f0550ef11b26",
    "dns_nameservers": [],
    "gateway_ip": "10.100.0.1",
    "ipv6_ra_mode": null,
    "allocation_pools": [
      {
        "start": "10.100.0.2",
        "end": "10.100.0.14"
      }
    ],
    "host_routes": [],
    "shared": false,
    "ip_version": 4,
    "ipv6_address_mode": null,
    "cidr": "10.100.0.0/28",
    "id": "cfb6c8b5-d94d-4788-b1b6-769ab403df4a",
    "subnetpool_id": null
  }
}

---

POST /controller/nb/v2/neutron/ports HTTP/1.1

{
  "port": {
    "binding:host_id": "ls",
    "allowed_address_pairs": [],
    "device_owner": "network:dhcp",
    "port_security_enabled": false,
    "binding:profile": {},
    "fixed_ips": [
      {
        "subnet_id": "cfb6c8b5-d94d-4788-b1b6-769ab403df4a",
        "ip_address": "10.100.0.2"
      }
    ],
    "id": "e3232392-b752-4f20-869e-2186ac76edba",
    "security_groups": [],
    "device_id": "dhcpf7a98173-37b1-5e61-9aec-e3057d825ed1-82953a35-0554-48e4-9ace-200a93ad88df",
    "name": "",
    "admin_state_up": true,
    "network_id": "82953a35-0554-48e4-9ace-200a93ad88df",
    "tenant_id": "0dde8d3f09764e849d19f0550ef11b26",
    "binding:vif_details": {},
    "binding:vnic_type": "normal",
    "binding:vif_type": "unbound",
    "mac_address": "FA:16:3E:9F:09:48"
  }
}

---
PUT /controller/nb/v2/neutron/ports/e3232392-b752-4f20-869e-2186ac76edba HTTP/1.1

{
  "port": {
    "binding:host_id": "ls",
    "allowed_address_pairs": [],
    "extra_dhcp_opts": [],
    "device_owner": "network:dhcp",
    "binding:profile": {},
    "port_security_enabled": false,
    "security_groups": [],
    "device_id": "dhcpf7a98173-37b1-5e61-9aec-e3057d825ed1-82953a35-0554-48e4-9ace-200a93ad88df",
    "name": "",
    "admin_state_up": true,
    "binding:vif_details": {
      "port_filter": true
    },
    "binding:vnic_type": "normal",
    "binding:vif_type": "ovs"
  }
}

Change-Id: Ie9b9baeea800955413ab71ebf9fa3f258f8df97c
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

netvirt: use setID/getID to catch up neutron northbound change

Neutron northbound introduced setID/getID method and deprecated
set<ResourceUUID>/get<ResrouceUUID> by
changeset of 235320f1eef27f7b9a9ad85043fc26f98816f982
change id of I00f473e1da31bb14bbdc27b1ccb1c8026b4343d9
This patch update ovsdb/netvirt to use new method and stop to use
deprecated method.

Change-Id: Ic2f97ddc9a03ef62eb1a66d56598d4b078125d2f
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Clean up ConfigActivator

Method refactor to greatly reduce duplicated code.

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

workaround: external arp resolver doesn't know IPv6

ovsdb net-virt doesn't support IPv6 yet. On the other hand opensatck
neutron Kilo release supports IPv6.
So as work around, ignore subnet of IPv6 in external arp resolver.
Otherwise the following exception occurs.

> 2015-07-22 15:23:31,185 | ERROR | ntDispatcherImpl | EventDispatcher                  | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_PORT, action=ADD, port=NeutronPort [portUUID=02b4a96c-e117-47e6-8af6-174edaf49c66, networkUUID=15f6f0f3-233a-4e8e-9efa-5ed092aca8b4, name=, adminStateUp=true, status=null, macAddress=FA:16:3E:57:87:DB, fixedIPs=[Neutron_IPs{ipAddress='172.24.4.3', subnetUUID='39cc05f6-dd5e-488a-b13e-b954fb2e0a9d'}, Neutron_IPs{ipAddress='2001:db8::3', subnetUUID='67ba5967-ff6a-4dc0-aea3-cd59d7bd12ef'}], deviceID=076e7e06-8d4f-42a5-9a1a-e8f41a0993d4, deviceOwner=network:router_gateway, tenantID=d41ad324d7a740b685895f6054dc41d7, floatingIPMap={}, securityGroups=[], bindinghostID=, bindingvnicType=normal, bindingvnicType=normal], subnet=null, router=null, routerInterface=null, floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.IllegalArgumentException: Supplied value "2001:db8::2" does not match required pattern "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(%[\p{N}\p{L}]+)?$"
>         at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)[39:com.google.guava:18.0.0]
>         at org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address.<init>(Ipv4Address.java:50)[49:org.opendaylight.yangtools.model.ietf-inet-types:2010.9.24.8-SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.triggerGatewayMacResolver(NeutronL3Adapter.java:1289)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronPortEvent(NeutronL3Adapter.java:212)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.doNeutronPortCreated(PortHandler.java:68)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.processEvent(PortHandler.java:164)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:97)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$100(EventDispatcherImpl.java:30)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:59)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_79]
>         at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_79]
>         at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]

Change-Id: Ia98dffa1b783e5f9d6d1c7e9b8f263213318789b
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

BUG #4045 net-virt-provider: workaround: ipv6 is not supported yet

At this point, ipv6 is not supported yet. But openstack neutron does.
Ignore ipv6 address for now. Otherwise exception as blow is thrown.
This patches works around BUG #4045.
TODO: implement ipv6 and then remove this work around

> 2015-07-21 17:22:14,077 | ERROR | ntDispatcherImpl | EventDispatcher                  | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_PORT, action=ADD, port=NeutronPort [portUUID=c625a77a-4720-4115-beb4-fd48bcd36727, networkUUID=dbe6f7d4-695f-45cc-a71c-1454057a4928, name=, adminStateUp=true, status=null, macAddress=FA:16:3E:39:9C:53, fixedIPs=[Neutron_IPs{ipAddress='fdbe:bc75:a195::1', subnetUUID='9a1077b9-a35f-46fe-a2d7-1536301979e8'}], deviceID=76751b66-0e7c-402d-9196-fac1d8c34627, deviceOwner=network:router_interface, tenantID=be9da0d68e28424db03bfb32574c78e5, floatingIPMap={}, securityGroups=[], bindinghostID=, bindingvnicType=normal, bindingvnicType=normal], subnet=null, router=null, routerInterface=null, floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.IllegalArgumentException: Supplied value "fdbe:bc75:a195:0:0:0:0:1/64" does not match required pattern "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))$"
>         at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)[39:com.google.guava:18.0.0]
>         at org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix.<init>(Ipv4Prefix.java:49)[49:org.opendaylight.yangtools.model.ietf-inet-types:2010.9.24.8-SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.RoutingService.programRouterInterface(RoutingService.java:85)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programRouterInterfaceStage2(NeutronL3Adapter.java:855)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programRouterInterfaceStage1(NeutronL3Adapter.java:833)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programFlowForNetworkFromExternal(NeutronL3Adapter.java:720)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programFlowsForNeutronRouterInterface(NeutronL3Adapter.java:688)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronRouterInterfaceEvent(NeutronL3Adapter.java:227)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronPortEvent(NeutronL3Adapter.java:186)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.doNeutronPortCreated(PortHandler.java:68)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.processEvent(PortHandler.java:164)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:96)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$100(EventDispatcherImpl.java:30)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:59)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_79]
>         at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_79]
>         at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]

Change-Id: I5db1bc9ad9f008c984c4ab4fa34569a3baffe310
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

catch up for ODL neutron northbound change

The change set of 062fa890fb918daa62114eddac75d7956c83e5f7,
Change-Id of I9c4041f334d65f7007b68eb7a14eb57a0c08bb9e
in ODL neutron project
eliminates NeutronSubnet.getPortInSubnets().
This causes compilation error with symbol not found.
This patch fixes it by avoiding eliminated method.

Change-Id: I2320e62dd7eb3e7da8218ff9701550bde96d820f
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Bug 3378 - ovsdb netvirt needs help in getting mac for a given ip in br-ex

Added periodic refresh of gateway mac address
Fixed packet deserialization exception

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

Enable cancel monitoring

Enable monitor cancellation rpc method.
Also rewrite code of handle new ssl connection to remove thread sleep
and improve performance.

Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Change-Id: Ic5982e28192ed0db1a363889a9eaf3b0817f17b8

Merge "Revert "Remove incorrect or unnecessary relativePaths""

Revert "Remove incorrect or unnecessary relativePaths"

[12:45:12]  <zxiiro> flaviof: we need ot revert that last one it breaks autorelease

This reverts commit f9e874496792523a80586bdbade89b1a5c4f1bb9.

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

Merge "Remove incorrect or unnecessary relativePaths"

Remove incorrect or unnecessary relativePaths

For external modules, relativePath doesn't make much sense.
For internal modules, an empty relativePath can be safely deleted.

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

Fix license header violations in ovs-sfc

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

Fix license header violations in plugin-mdsal-adapter

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

Fix license header violations in plugin-shell

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

Fix license header violations in ovsdb-plugin-compatibility-layer

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

Fix license header violations in northbound

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

Fix license header violations in plugin

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

Fix license header violations in schemas

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

Fix license header violations in library

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

Fix license header violations in net-virt-providers

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

Fix license header violations in net-virt

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

Fix license header violations in utils

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

Fix license header violations in southbound

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

Use interfaces rather than classes where appropriate

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

Merge "Bug fix for 3545"

Merge "Clean up Maven dependencies (part 1)"

Bug fix for 3545

https://bugs.opendaylight.org/show_bug.cgi?id=3545

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

General Sonar clean-up

Return simplification in a number of places:
* drop useless return at the end of void methods (unless it comes before
  commented code)
* simplify return ... ? true : false
* simplify variable declaration immediately followed by return

Drop unused local variables, and move some declarations closer to first
use (in particular when there's a redundant initialisation value).

Drop unused fields where it's safe to do so; in particular,
OvsdbClientImpl's exceptions were never initialised so we can even drop
the corresponding getter.

Drop unnecessary casts and use the Java 7 <> operator as appropriate.

Use primary types instead of wrappers where appropriate (dpid,
openFlowPort).

Drop redundant final modifiers on static methods.

Drop redundant .toString() calls.

Use .parseInt(), .parseShort() etc. instead of .decode().

Drop a few dead methods.

Avoid calling new String() explicitly.

Drive-by cleaning:
* AbstractHandler:
  - switch instead of multiple ifs
* BridgeConfigurationManagerImpl, ConfigurationServiceImpl:
  - rework getControllerIPAddress() to loop over the configuration
    properties
  - in getNormalizedRow(), avoid rebuilding the array every time we go
    through the loop
* ConfigurationServiceImpl:
  - in getTunnelEndPoint(), trace the tunnel endpoint only if we get
    one (avoids a NPE)
* EgressAclService, IngressAclService:
  - srcIpPrefix only makes sense if securityRuleIpPrefix != null, so
    move into the corresponding block

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

Clean up Maven dependencies (part 1)

Remove unused dependencies, and explicitly declare dependencies
which are used directly (and used to be pulled in transitively).
This will help future work on odlparent and upgrading upstream
dependencies, as well as stabilising the dependencies on other
ODL projects.

The changes necessary were determined using
dependency:analyze-report.

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

Revert "Support Jackson 2.5"

This reverts commit 70b00fe87a469abadf37f84602d436efe358b5cb.

This patch was created in response to c464b9a2a63c4ff41468b2e20ac48db806c918d6 in odlparent. That patch caused other failures so it was reverted and now this patch is reverted til the issues are fixed.

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

Support Jackson 2.5

TypeIdResolver added a new variant of typeFromId(), support that
in OvsdbTypesIdResolver.

(Apparently this class isn't used anywhere, so it might be better
to delete it instead...)

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

Use parent version for maven-dependency-plugin

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

Merge "Clean up logging"

Clean up logging

Clean up logger declarations as per
https://wiki.opendaylight.org/view/Logging_Best_Practices: always
specify
    private static final Logger LOG = LoggerFactory.getLogger(...)
and use parameterised logging.

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

Indicate that RefType values need to be lower-case

Sonar complains that RefType's values should be upper-cased (as
constants), but since they match JSON values they need to be lower-case.

While we're at it, drop an unnecessary null declaration, remove the
redundant static modifier from RefType, and merge two if statements.

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

Explicitly set git-review branch to master

Change-Id: Ic5c7989ade5262f846bbad7f5a36bf8754542aab
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Also-By: Thanh Ha <thanh.ha@linuxfoundation.org>

Allow NetvirtIT to determine its karaf version

Pax Exam needs a dependency on karaf so
AbstractConfigTestBase::getKarafDistro() can determine the appropriate
version.

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

Allow SouthboundIT to determine its southbound-karaf version

Since AbstractConfigTestBase::getKarafDistro() now uses
versionAsInProject(), Pax Exam needs a dependency on southbound-karaf so
it can determine the appropriate version.

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

Merge "Remove all redundant public modifiers in interfaces"

Merge "Sonar clean-up: OF13Provider"

Merge "Add libvirt support"

Add libvirt support

Set up memory sizes with libvirt. I'm not familiar enough with Ruby to
know if there's a way of combining the :virtualbox and :libvirt
stanzas...

(The box images still need to be mutated manually.)

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

Update showOvsdbMdsal.py to display bridge name and mac next to alias

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

Remove all redundant public modifiers in interfaces

The public modifier is unnecessary in interfaces, their contents are
public by default.

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

Sonar clean-up: OF13Provider

This class contains lots of methods with unused parameters, but they
follow a pattern so override that instead of cleaning up the
parameters.

Dead-code elimination (unused methods, unnecessary initialisations).
Code which corresponds to comment method calls is marked as such so
it no longers causes Sonar warnings (with a TODO added to check the
call sites).

getTunnelReadinessStatus() appears unused but is tested for in the
corresponding unit-test class, so keep it for now and override the
unused warning.

Long dpid -> long dpid.

if (!local) {} if (local) {} -> if (!local) {} else {} (the value of
local doesn't change in the first block).

networkingProviderManager is initialised and used in a single method,
so convert it to a local variable and adjust the corresponding test.

Return value simplification (? true : false isn't necessary).

<> operator in OF13ProviderTest.

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

Bug 3378 - ovsdb netvirt needs help in getting mac for a given ip in br-ex

This patch, does not do periodic refresh of gateway mac. Will push that in next gerrit.

Change-Id: Ie1a5a81fb7f196874f87bfbe0095ea595756a0a4
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 65a8de37c522f8f09caf6be73997906b98fd0b89)

Fix it failure: Error resolving artifact

Fix the following issue:
error: java.io.IOException: Error resolving artifact org.opendaylight.ovsdb:southbound-karaf:zip:1.1.0-SNAPSHOT

In it builds, such as:
https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-daily-full-lithium-integration/OVS_VERSION=2.3.0,jdk=openjdk7,nodes=dynamic_docker/

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

Merge "Sonar clean-up: braces for control statements"

Merge "Added fixed DHCP security rules, which will be added on a VM create."

Sonar clean-up: braces for control statements

Add braces for if, while, for statements. (Automated, thanks IntelliJ!)

In a few cases a different change was more appropriate:
* ConfigurationServiceImpl.java: in unsetOvsdbConfigurationService(),
  the if is redundant, we might as well set to null unconditionnally.
* ConnectionServiceImpl.java: likewise
* OvsdbLibraryIt.java: instead of
  if (...) { return true; } return false;
  just
  return ...;
* OvsdbVswitchdSchemaConstants.java: likewise

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

Added fixed DHCP security rules, which will be added on a VM create.

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

Clean-up in BridgeOperationalState

The main fix is moving null-checks on iid before their first use.

db and changes are only used in the constructor, they don't need to
be in the instance; since the class isn't serializable removing the
fields doesn't change anything external.

Java 7 improvements: <> operator and merged exceptions.

Use Optional.fromNullable() to simplify some Optional creation code
and avoid double calls to getAugmentation().

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

Merge "Fix Javadoc error."

Fix Javadoc error.

[ERROR] /Users/adetalhouet/Documents/odl/Beryllium/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java:288: error: @param name not found
[ERROR] * @param action the {@link org.opendaylight.ovsdb.openstack.netvirt.api.Action} action to be handled.

Java version "1.8.0_45"

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

Add showOvsdbMdsal.py tool

This tool can provide useful info in regards to ovsdb's mdsal structures.
It looks at the operational or config trees in mdsal, depending on the
parameter '--config':

Patch set 2: code review

$ ./showOvsdbMdsal.py -h
Usage: showOvsdbMdsal.py [options]

Options:
  --version             show program's version number and exit
  -h, --help            show this help message and exit
  -d, --debug           Verbosity. Can be provided multiple times for more
                        debug.
  -n, --noalias         Do not map nodeId of bridges to an alias
  -i ODLIP, --ip=ODLIP  opendaylights ip address
  -t ODLPORT, --port=ODLPORT
                        opendaylights listening tcp port on restconf
                        northbound
  -u ODLUSERNAME, --user=ODLUSERNAME
                        opendaylight restconf username
  -p ODLPASSWORD, --password=ODLPASSWORD
                        opendaylight restconf password
  -c, --config          parse mdsal restconf config tree instead of
                        operational tree
  -f, --hide-flows      hide flows

Examples of what to expect:

  https://gist.githubusercontent.com/anonymous/3a952cec49ef92461752/raw/7abfedcd7790acc5b5cef07a2c08da0405f303c6/gistify465337.txt

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

Merge "Update README to reflect LBaaS postman collection."

Merge "Change log level of raw json rpc message"

Change log level of raw json rpc message

When hypervisor/hardware vtep are not implemented in the right way and sending jsonrpc message with wrong format, the log of raw json rpc message helps debugging.

Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Change-Id: I033abdb251065dd19c8ee198417f04bcd152e761

Adding more documentation/comments to the code.

Change-Id: Ieb9b84fd53b400b3c01c5b583337dd480b2207c1

Signed-off-by: Marcelo C. Amaral <marcelo.amaral@bsc.es>

Update README to reflect LBaaS postman collection.

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

Add postman collection to interact with LBass.

This postman contains queries to interact with:
- pool
- pool member
- loadbalancer

It also contains queries to create a network, a subnet and two ports, in order to have a proper network topology for testing purposes.

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

Bug 3962: Event dispatcher found no handler for NorthboundEvent (part 1)

We cannot reproduce this locally, so this commit adds some better logs
to inform what handlers have this issue.

Patch set 2: code review.
Patch set 3: remove redundant param on the non-error path: ref.

Change-Id: I394984cf41f7e310919efdb7c4bbf394ba1fa89d
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
(cherry picked from commit 0b6e3a67980f9e30ba9cf07ddd0fd2d1c6664e1f)

Merge Sonar fixes from stable/lithium..

Change-Id: I03d18ba2dcaa76de565d53bc9dd68f9b28c2b240
Signed-off-by: Andre Fredette <afredette@redhat.com>

Merge "bug 3909: Disable SSLv3 connection for ovsdb server"

Bug 3954: NPE exception in isDistributedArpDisabled()

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

bug 3909: Disable SSLv3 connection for ovsdb server

SSLv3 has known vulnerability.
For security reason, we should disable sslv3 protocol for ovsdb server.

Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Change-Id: I1267711efe7cebcd3252d81f184aab8782b6d72d

Merge "Add ODL controller ready check before running robot tests"

Add ODL controller ready check before running robot tests

Change-Id: I8ee340873ee47af89373afe5ed81bcff787a524a
Signed-off-by: Ben Eze <beze@inocybe.ca>

Merge "Update NeutronL3Adapter UT"

Merge "Sonar bug fix: block of commented-out lines of code should be removed"

Sonar bug fix: block of commented-out lines of code should be removed

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>

Update NeutronL3Adapter UT

Patch Set 1: initial commit
Patch Set 2: some more to go
Patch Set 3: some more tests - done with the class

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

Update OF13Provider UT

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

Bug 3893: provide well known url to know that net-virt topology is ready

With this change, one can check the following url and know that ovsdb's netvirt
is up and functional:

   http://${ODL_IP}:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1

Patch set 2: fix transaction
Patch set 3: code review, move new function to OvsdbInventoryServiceImpl
Patch set 4: typo (functional)

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

Merge "Added the robot framework to OVSDB VMs"

Added the robot framework to OVSDB VMs

Change-Id: Ib57793b05661d5d5487788574ef65cfa990d3cb4
Signed-off-by: Ben Eze <beze@inocybe.ca>

Fix Javadoc errors.

The build was failing due to those errors:
[ERROR] /ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java:13: error: @param name not found
 --> doesn't exist
[ERROR] /ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java:22: error: @param name not found
--> doesn't exist
[ERROR] /ovsdb/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java:205: error: @param name not found
--> Node instead of node

Java version "1.8.0_45"

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

Merge "Sonar bug fix"

Bug 3841 - wrong severity level: getTenantNetwork did not find network

when using normal ovsdb net-virt, I see benign logs like these:

WARN  | ntDispatcherImpl | TenantNetworkManagerImpl | 271 - org.opendaylight.ovsdb.openstack.net-virt - 1.1.0.SNAPSHOT | getTenantNetwork did not find network for patch-int

these should be debug at best; not warning.

Patch set 2: add changes from code review

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

Bug-2094 : less is more remove redundant code

In pipeline, there is no need to set register value to 0,
as that is the expected value upon classifier table.

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

Bug 3831 - ignore unknown OVS interface and datapath types

Ighore OVSDB interface or datapath types which are not
present in the MD-SAL southbound model (but are present
in the OVS nodes open_vswitch table iface-types or
datapath-types columns).

Tested by making a build of ODL which removed supported
types from the ODL code to varify the log warnings
were created.

Change-Id: I05e689fa2b2dc906e3083e4fc44ba60abdb1d352
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
(cherry picked from commit c525fd2b379171af656ffd060d9e520ab4e3854e)

Bug 3831 - add stt interface type to model

On a build from openvswitch master branch, there was an
interface type 'stt' which was not included in the ovsdb.yang
model for the southbound MD-SAL.  When an OVSDB connection
was made to this OVS node, the operational md-sal failed
to populate.

Adding the 'stt' interface type to the model is a quick
fix.  A better fix would ignore types not present in the model.

Change-Id: Idf259998f73d43be587d19de73794a174d4d81d3
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
(cherry picked from commit 444b68f6f7637d9b4eb7e4f07c9ff6ced4e8ce76)

Sonar bug fix

Removing redundant 'public' keyword in interface in ConfigurationService.java

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>

Remove frame size limit for scale OVS

Change-Id: I4f1c7e29c332964eea077fd6958453be34fa04a5
Signed-off-by: Sharon Aicler <saichler@cisco.com>

Bug 3647 :Operational not set correctly when other-config is removed from switch.

similar to BZ 3647, but for other-config

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

Bug 3647 : Fix for bugzilla 3647

https://bugs.opendaylight.org/show_bug.cgi?id=3647

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