Merge "Bug 2316 - Fixing equals() in LoadBalancerMember class to be compliant and also use .equals instead of == for comparing Strings"

Bug 2316 - Fixing equals() in LoadBalancerMember class to be compliant
and also use .equals instead of == for comparing Strings

Change-Id: I5a4cad3f66540abe9c9d8ff5b2d2211aa9b6d0f4
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Add adsal-compatibility to ovs-sfc features since sal-compatibility was added to md-sal-openflow

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

Merge "Fixes to get ovsdb running in eclipse"

Fixes to get ovsdb running in eclipse

This gerritt fixes the lifecycle and plugin maven errors. With this fix I don't see any more major errors. There are still some warnings that I will look at in a later commit.

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

Add unit-tests for ConfigProperties

Patch 4: Implement feedback from shague

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

Merge "Fix issue found by sonar: Method call on object which may be null"

Add workaround because sfc models changed.

This workaround simply comments out the offending lines. The ovs-sfc code will be updated when the models settle down.

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

Fix issue found by sonar: Method call on object which may be null

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

Bug 2214 - Unable to set the external_ids field of the Qos object

Fix typo on external_ids for QoS table, to conform with
http://openvswitch.org/ovs-vswitchd.conf.db.5.pdf page 38.

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

Merge changes I89f90cf4,I248403b7

* changes:
  Add unit-tests for OvsdbNorthboundV3
  Add printCache unit tests.

Update readme to include karaf run description.

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

Add unit-tests for OvsdbNorthboundV3

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

Add printCache unit tests.

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

Merge "Ignore testGetOpenflowVersion: it is no longer applicable"

Merge "Enable SSL connection for ovsdb server."

Enable SSL connection for ovsdb server.

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

Ignore testGetOpenflowVersion: it is no longer applicable

The openFlow version is now determined by configuration's getProperty("ovsdb.of.version", "1.3").
Thus, the ovs version attribute (returned by ovs' OpenVSwitch table) is not used to determine what is
the openFlow version chosen by netVirtConfigurationService.

See: https://git.opendaylight.org/gerrit/#/c/11084/
     https://github.com/opendaylight/ovsdb/commit/2bc58c9cca16dc3e389cdfc18593578748fd52d5

Patch 2: include Sam's feedback

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

Merge "Add template unit-tests for bundles that don't have any."

Add template unit-tests for bundles that don't have any.

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

Bug 2192 - Part 3 - Make ovsdb library not depend on ovsdb.utils.config

The ovsdb library is designed as Java modular component that can work in
both OSGi and non-OSGi environments. Thus, it should depend on as few
bundles/jar as possible.

Patch 4: Implement feedback from Sam H.

Change-Id: If2aca5ac2f2e883907e28d9ddb7986f0a5c8c1ab
Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Fix NeutronIT testGetTunnelEndpoint

The test was broken in that it attempted to update all fields of the OpenVSwitch
row. That is not valid due to immutable columns, such as _version.

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

Cleaning up code of InventoryServiceImpl to remove function updateOFBridgeName() that is never used.

Change-Id: I68e32b090ac8701cd08e252df294ef83785a6055
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Update readme with minor corrections.

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

Bug 2192 - Part2 - Move getProperty() to a common util module

With this change, the calls to obtain non-default configurations for OVSDB
have been moved to a single function.

Patch 2: Rename utils.common to utils.config
         Remove utils.config dependency from common/parent/pom.xml (not needed by all)

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

Revert "Retructuring the utils folder to make it a broader toolkit beyond just a mdsal toolkit. This will make room for adding the config prop utils."

This reverts commit 353b7ec925f3a82aabf52bb21a40189397c5176e.

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

Retructuring the utils folder to make it a broader toolkit beyond just
a mdsal toolkit. This will make room for adding the config prop utils.

Change-Id: I3df261ece22b9674c8e7a9cbd145ae766c961e64
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Merge "Add missing feature dependencies to ovsdb karaf distro"

Add missing feature dependencies to ovsdb karaf distro

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

Bug 2076 - Routing does not work unless node contains vms on all vlans (segIds)

The logic for determining whether or not entries should be added to table 70 was
not taking into consideration the fact that vms on non-local vlans are also needed.

The fix simply fixes the logic used to filter out L3 fwd entries.

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

Bug 2192 - Fix access to custom.properties, so non-default values can be provided

When OVSDB changed to use Karaf, the custom variables in config.ini got moved to
custom.properties. With that change, OVSDB was not grabbing its custom values from
the right place, causing all OVSDB related properties to get ignored.

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

Merge "Fix some compiler warnings."

Fix some compiler warnings.

1. Duplicated dependencies in many poms.
2. Dynamic versions for artifact ids.

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

Update README to include all current projects.

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

Add import statements for o.o.o.o.n.a.ConfigurationService

Change-Id: Id72133738a78dea3f4fb6b9c87bf726b1f6aeb04
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>

Incrementing versions by 0.1.0 for post-Helium master branch

Change-Id: I83919752fe6ba2cbb2fbfd2ace0e060dd6b3f019
Signed-off-by: Colin Dixon <colin@colindixon.com>

Bug 2096 - LBaaS pool member deletion is not resetting rules properly

The LBConfig cloning is losing the segmentationID. This is fixed here.

Change-Id: If6f828fca09c3a02fa9bfc16ef97c439a702ae4a
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 2092 - Invalid code in LBaaS handlers that extracts MAC address of member without paying attention to the subnet-ID.

This prevent ID address overlap of LBaaS pools and wrong rules written to switch.

Change-Id: I9624a7e503810a5cbc8db0ca00b2cfc9d1dc8191
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Merge "Bug 1806 - Null destination InetAddress in OF13Provider.handleInterfaceUpdate"

Bug 1806 - Null destination InetAddress in OF13Provider.handleInterfaceUpdate

The error is caused when ovsdb can not find the local_ip address from the open_vSwitch table other_config row. this address is used to get the src or dst ip address to be used for tunnels.

Added null chcks around the src and dst ip addresses. Log a warning if either is missing.

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

Merge "Bug 2013 Vlan flows needs merging from traditional rules to a single L2Fwding Service"

Bug 2013 Vlan flows needs merging from traditional rules to a single L2Fwding Service

Add fixes for the interface delete cases:
- include the latest rules that needed to be removed
- rework the bcast rule in the piece where a port is removed from the output list. The existing method assumed that the only actions in the apply actions case are all output actions, but the vlan bcast rule has an output to ethPort, followed by popVlan and then the output to flood ports. Also the md-sal does not maintain the order that rules were entered so that cannot be relied upon. This required creating anew method to handle the cases and ensure the proper actions are recreated.

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

Swap segmentation Id when routing between subnets

Fixes bug 2052
https://gist.github.com/803a61717fdc153fde5a

Change-Id: I4f61531d5e58cf7969e8a26f80cc2c015338da54
Signed-off-by: Flavio Fernandes <ffernandes@redhat.com>
Signed-off-by: Dave Tucker <djt@redhat.com>

Merge "Bug 2013 - Vlan flows needs merging from traditional rules to a single L2Fwding Service"

Bug 2013 - Vlan flows needs merging from traditional rules to a single L2Fwding Service

Patch set 2: Remove loogger in handleInterfaceUpdate.

Patch set 1:
Main problem is the vlan flows required two l2 tables, one for ingress and the other for egress. The existing flows made assumptions that those two tables existed. The pipeline changes reduced the l2 forwarding to a single table.

The classifier table has:
- unicast rules to take traffic from the local ports and tag them withthe tenant id
- ingress vlan rules to forward vlan tagged packets from the network
- drop everything else coming from the local ports

The l2 forwarding tables has:
- drop everything not matching the other rules
- unicast rules to forward traffic to the local port after stripping the tag
- broadcast rules to forward tagged packets to the network with the tag and to strip the tag and forward to the local ports
- catch all, forward vlan tagged packets to the network

The old rules looked like this:
Old rules:
1. table=0, in_port=2,dl_vlan=101 actions=goto_table:20
2. table=0, in_port=1,dl_src=fa:16:3e:9d:2e:27 actions=push_vlan:0x8100,set_field:101->vlan_vid,goto_table:10
3. table=0, priority=8192,in_port=1 actions=drop
4. table=0, dl_type=0x88cc actions=CONTROLLER:65535

5. table=10, priority=8192,dl_vlan=101 actions=output:2
6. table=10, priority=16384,dl_vlan=101,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,goto_table:20
7. table=10, dl_vlan=101,dl_dst=fa:16:3e:9d:2e:27 actions=goto_table:20

8. table=20, priority=8192,dl_vlan=101 actions=drop
9. table=20, priority=16384,dl_vlan=101,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=strip_vlan,output:1
10. table=20, dl_vlan=101,dl_dst=fa:16:3e:9d:2e:27 actions=strip_vlan,output:1

The new rules look like this.
1. table=0,in_port=1,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:85:80:97 actions=push_vlan:0x8100,set_field:6097->vlan_vid,goto_table:20
2. table=0,in_port=2,dl_vlan=2001 actions=goto_table:20
3. table=0,priority=8192,in_port=1 actions=drop
4. table=0,dl_type=0x88cc actions=CONTROLLER:65535

5. table=110,priority=0 actions=drop
6. table=110,dl_vlan=2001,dl_dst=fa:16:3e:85:80:97 actions=pop_vlan,output:1
7. table=110,priority=16384,dl_vlan=2001,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,pop_vlan,output:1,output:3,output:4
8. table=110,priority=8192,dl_vlan=2001 actions=output:2

In this example there is a router port and two vms on an openstack control node and a second compute node with two vms.

Compute + network node with two vlans and a vm in each vlan:
[odl@fedora41 devstack]$ sudo ovs-ofctl --protocol=OpenFlow13  dump-flows br-int
OFPST_FLOW reply (OF1.3) (xid=0x2):
cookie=0x0, duration=1594.264s, table=0, n_packets=29, n_bytes=2490, send_flow_rem in_port=4,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:7a:12:25 actions=push_vlan:0x8100,set_field:6097->vlan_vid,goto_table:20
cookie=0x0, duration=1678.603s, table=0, n_packets=20, n_bytes=1376, send_flow_rem in_port=1,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:85:80:97 actions=push_vlan:0x8100,set_field:6097->vlan_vid,goto_table:20
cookie=0x0, duration=1597.280s, table=0, n_packets=26, n_bytes=3220, send_flow_rem in_port=3,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:6e:d8:df actions=push_vlan:0x8100,set_field:6097->vlan_vid,goto_table:20
cookie=0x0, duration=95.810s, table=0, n_packets=21, n_bytes=2042, send_flow_rem in_port=7,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:13:e8:9b actions=push_vlan:0x8100,set_field:6098->vlan_vid,goto_table:20
cookie=0x0, duration=104.865s, table=0, n_packets=17, n_bytes=1138, send_flow_rem in_port=5,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:6e:fd:9b actions=push_vlan:0x8100,set_field:6098->vlan_vid,goto_table:20
cookie=0x0, duration=101.849s, table=0, n_packets=26, n_bytes=3220, send_flow_rem in_port=6,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:25:4a:26 actions=push_vlan:0x8100,set_field:6098->vlan_vid,goto_table:20
cookie=0x0, duration=102.857s, table=0, n_packets=19, n_bytes=1926, send_flow_rem in_port=2,dl_vlan=2002 actions=goto_table:20
cookie=0x0, duration=1676.601s, table=0, n_packets=26, n_bytes=2332, send_flow_rem in_port=2,dl_vlan=2001 actions=goto_table:20
cookie=0x0, duration=95.310s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=7 actions=drop
cookie=0x0, duration=1596.706s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=3 actions=drop
cookie=0x0, duration=101.339s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=6 actions=drop
cookie=0x0, duration=104.364s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=5 actions=drop
cookie=0x0, duration=1678.113s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=1 actions=drop
cookie=0x0, duration=1593.762s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=4 actions=drop
cookie=0x0, duration=1763.032s, table=0, n_packets=881, n_bytes=45681, send_flow_rem priority=0 actions=goto_table:20
cookie=0x0, duration=1763.868s, table=0, n_packets=0, n_bytes=0, send_flow_rem dl_type=0x88cc actions=CONTROLLER:65535
cookie=0x0, duration=1762.531s, table=20, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:30
cookie=0x0, duration=1762.026s, table=30, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:40
cookie=0x0, duration=1761.523s, table=40, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:50
cookie=0x0, duration=1761.019s, table=50, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:60
cookie=0x0, duration=1760.515s, table=60, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:70
cookie=0x0, duration=1760.011s, table=70, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:80
cookie=0x0, duration=1759.507s, table=80, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:90
cookie=0x0, duration=1759.003s, table=90, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:100
cookie=0x0, duration=1758.496s, table=100, n_packets=1065, n_bytes=63425, send_flow_rem priority=0 actions=goto_table:110
cookie=0x0, duration=1757.988s, table=110, n_packets=889, n_bytes=46261, send_flow_rem priority=0 actions=drop
cookie=0x0, duration=1593.258s, table=110, n_packets=22, n_bytes=2084, send_flow_rem dl_vlan=2001,dl_dst=fa:16:3e:7a:12:25 actions=pop_vlan,output:4
cookie=0x0, duration=1677.600s, table=110, n_packets=7, n_bytes=526, send_flow_rem dl_vlan=2001,dl_dst=fa:16:3e:85:80:97 actions=pop_vlan,output:1
cookie=0x0, duration=100.836s, table=110, n_packets=12, n_bytes=1024, send_flow_rem dl_vlan=2002,dl_dst=fa:16:3e:25:4a:26 actions=pop_vlan,output:6
cookie=0x0, duration=103.861s, table=110, n_packets=4, n_bytes=288, send_flow_rem dl_vlan=2002,dl_dst=fa:16:3e:6e:fd:9b actions=pop_vlan,output:5
cookie=0x0, duration=94.808s, table=110, n_packets=14, n_bytes=1616, send_flow_rem dl_vlan=2002,dl_dst=fa:16:3e:13:e8:9b actions=pop_vlan,output:7
cookie=0x0, duration=1596.275s, table=110, n_packets=12, n_bytes=1024, send_flow_rem dl_vlan=2001,dl_dst=fa:16:3e:6e:d8:df actions=pop_vlan,output:3
cookie=0x0, duration=102.354s, table=110, n_packets=30, n_bytes=3156, send_flow_rem priority=16384,dl_vlan=2002,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,pop_vlan,output:5,output:6,output:7
cookie=0x0, duration=1676.095s, table=110, n_packets=32, n_bytes=3332, send_flow_rem priority=16384,dl_vlan=2001,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,pop_vlan,output:1,output:3,output:4
cookie=0x0, duration=1677.102s, table=110, n_packets=24, n_bytes=2172, send_flow_rem priority=8192,dl_vlan=2001 actions=output:2
cookie=0x0, duration=103.359s, table=110, n_packets=19, n_bytes=1942, send_flow_rem priority=8192,dl_vlan=2002 actions=output:2

Compute node with two vlans and a vm in each vlan:
[odl@fedora42 devstack]$ sudo ovs-ofctl --protocol=OpenFlow13 dump-flows br-int
OFPST_FLOW reply (OF1.3) (xid=0x2):
cookie=0x0, duration=1406.878s, table=0, n_packets=21, n_bytes=2042, send_flow_rem in_port=1,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:6e:46:15 actions=push_vlan:0x8100,set_field:6097->vlan_vid,goto_table:20
cookie=0x0, duration=151.628s, table=0, n_packets=22, n_bytes=2365, send_flow_rem in_port=3,vlan_tci=0x0000/0x1fff,dl_src=fa:16:3e:d6:cc:a8 actions=push_vlan:0x8100,set_field:6098->vlan_vid,goto_table:20
cookie=0x0, duration=149.620s, table=0, n_packets=18, n_bytes=1924, send_flow_rem in_port=2,dl_vlan=2002 actions=goto_table:20
cookie=0x0, duration=1404.872s, table=0, n_packets=15, n_bytes=1682, send_flow_rem in_port=2,dl_vlan=2001 actions=goto_table:20
cookie=0x0, duration=151.128s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=3 actions=drop
cookie=0x0, duration=1406.379s, table=0, n_packets=0, n_bytes=0, send_flow_rem priority=8192,in_port=1 actions=drop
cookie=0x0, duration=1473.298s, table=0, n_packets=733, n_bytes=39306, send_flow_rem priority=0 actions=goto_table:20
cookie=0x0, duration=1474.295s, table=0, n_packets=0, n_bytes=0, send_flow_rem dl_type=0x88cc actions=CONTROLLER:65535
cookie=0x0, duration=1472.797s, table=20, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:30
cookie=0x0, duration=1472.286s, table=30, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:40
cookie=0x0, duration=1471.792s, table=40, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:50
cookie=0x0, duration=1471.291s, table=50, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:60
cookie=0x0, duration=1470.788s, table=60, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:70
cookie=0x0, duration=1470.286s, table=70, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:80
cookie=0x0, duration=1469.784s, table=80, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:90
cookie=0x0, duration=1469.282s, table=90, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:100
cookie=0x0, duration=1468.780s, table=100, n_packets=809, n_bytes=47319, send_flow_rem priority=0 actions=goto_table:110
cookie=0x0, duration=1468.278s, table=110, n_packets=736, n_bytes=39797, send_flow_rem priority=0 actions=drop
cookie=0x0, duration=1405.876s, table=110, n_packets=15, n_bytes=1682, send_flow_rem dl_vlan=2001,dl_dst=fa:16:3e:6e:46:15 actions=pop_vlan,output:1
cookie=0x0, duration=150.626s, table=110, n_packets=15, n_bytes=1682, send_flow_rem dl_vlan=2002,dl_dst=fa:16:3e:d6:cc:a8 actions=pop_vlan,output:3
cookie=0x0, duration=149.115s, table=110, n_packets=11, n_bytes=1256, send_flow_rem priority=16384,dl_vlan=2002,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,pop_vlan,output:3
cookie=0x0, duration=1404.370s, table=110, n_packets=11, n_bytes=1252, send_flow_rem priority=16384,dl_vlan=2001,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:2,pop_vlan,output:1
cookie=0x0, duration=1405.374s, table=110, n_packets=10, n_bytes=790, send_flow_rem priority=8192,dl_vlan=2001 actions=output:2
cookie=0x0, duration=150.122s, table=110, n_packets=11, n_bytes=860, send_flow_rem priority=8192,dl_vlan=2002 actions=output:2

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

Merge "Bug 2041 - Fixing bug where the tunnel-id is not set in the LBaaS pipeline rules"

Merge "Bug 1859 - Remove the fake limitation that LBaaS only works with HTTP and HTTPS."

Merge "Bug 2036 - Adding code to parse dummy neutron port assigned for the VIP"

Bug 2045 - Egress / Ingress ACL swap broke the pipeline

Introduced by the fix for Bug 1752

Change-Id: Ibb4b23561871a6b076fe440b622842738076a930
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 2041 - Fixing bug where the tunnel-id is not set in the LBaaS pipeline rules

Change-Id: I552ed7823d06851677fe133f2a750dc590ab52c8
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 1859 - Remove the fake limitation that LBaaS only works with
HTTP and HTTPS.

Now it allows all TCP ports. The user needs to take
caution not to lock themselves out by letting LBaaS take over
critical ports for direct access. The user also needs to ensure
that the members are all using same TCP ports.

Change-Id: I8bec4bf893446cf9478480d9cc9e76a8cb3ca9c9
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 2036 - Adding code to parse dummy neutron port assigned for the VIP

In case you wish to use the LB instance within a subnet without assigning
a floating IP, then you need to add a dummy neutron port to the subnet and
use the IP assigned to that as the VIP. The patch will pick that up and use
it in the reverse traffic rules.

Change-Id: I3e973cfe747c5c1dcb0e639734cdb291ac23210b
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Merge "Bug #1752 swap egress/ingress ACLs"

Merge "Add L3 Forwarding Table to Pipeline"

Bug #1752 swap egress/ingress ACLs

Patch#2: updated comments

Change-Id: I6d0bb1c3f0e3245f128ad084df1a19cb3122af4f
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>

Merge "Only use single Apply Actions instruction"

Add L3 Forwarding Table to Pipeline

Fixes bug 2033

Change-Id: Id1fdb87ea617d83d3d8c035993aa3b9abcbfb258
Signed-off-by: Dave Tucker <djt@redhat.com>

Only use single Apply Actions instruction

There should only be one Apply Actions instruction in an Instruction Set
Fixes bug 2029

Change-Id: I415a00c36e951b4b228cde60633b6361df23f77d
Signed-off-by: Dave Tucker <djt@redhat.com>

Bug 1705: Expect default gateways mac to be provided

Patch 4: Move check to caller of RoutingService::programDefaultRouteEntry()
Patch 5: noop

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

Merge "Bug 1915 : Configuration knob for enabling L3 fwd in OVSDB"

Bug 1695 - ignoring pipeline rules for any non-forwarding bridge

By design, the AbstractServiceInstance kept the isBridgeInPipeline as an abstract method for its child concrete Services
to determine the behaviour.

But, the most important and basic case of allowing the pipeline flows on br-int and ignoring on all other Bridge seems
reasonable default in AbstractServiceInstance. This can be overriden by child Services if need be.

In addition to this fix, have also introduced a minor delay in PipelineOrchestrator as soon as a Node event is observed.
This should workaround one of the basic bugs (1997) on the pipeline management case at the minimum.

Change-Id: I34f1d24d3f72695851bda4379483c8ea2b292308
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 2004 - Fixing issue where local ports are not receivers for flood originating from another local port

The fix was to update classifier to track whether a flood is coming from local or
remote, and then matching on it to apply the enumerated flood action. The fix also
required OF13Provider to register local ports with the flood rule creation logic.

Reg0 is used by Classifier and LBaaS is moved to Reg1 + Reg2.

Change-Id: I619247349631f909dcc77177bd4cfe733afe7d50
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Merge "Fixing files in resources that are for debugging help."

Bug 1915 : Configuration knob for enabling L3 fwd in OVSDB

OVSDB L3 fwd code will check for system property 'ovsdb.l3.fwd.enabled'
to determine whether it should be enabled upon OVSDB init.

To enable it, all that is needed is something like:
   echo 'ovsdb.l3.fwd.enabled=yes' >> ./configuration/config.ini

To disable, all that is needed is something like:
   sed -i -e 's/ovsdb\.l3\.fwd\.enabled\=.*$/ovsdb\.l3\.fwd\.enabled=no/'  ./configuration/config.ini

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

Bug 2008 - Local Instance rules are failed to get programmed in L2FwdService table in presence of security groups

Change-Id: I0f628ba0099e3acfbbf06dfb381d35317647970d
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Fixing files in resources that are for debugging help.

1. Fixing puppet bootstrap for vagrant initialization. Currently,
it references to puppetlabs-release-saucy.deb that doesn't exist.
2. Adding postman collection for the LBaaS

Change-Id: I915d9a73e9865fb16d910b0971907acee63fc65c
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 1981: NumberFormatException in ArpResponderService while programming Static ARP entries

The function ActionUtils.nxLoadArpShaAction() can now take a BitInteger or MacAddress.

Change-Id: Ia53a1e32d33b69f2ec0453d5c816d5f8c404814d
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Merge "Add missing Order and Key to InstructionBuilders"

Merge "Bug 1885: VM ingress rule is not installed for vlan networking"

Merge "Fix ARP Responder Actions"

Merge "Bug 1998 - Fixing Bridge Set-Controller operation failure"

Bug 2001 - Removing code that deletes flow state when a node is removed.

This patch ensures the TransactionCommitFailedException is not being caused.
We let the MD-SAL deal with clearing state and bringing it back when the node
is removed and added back.

Change-Id: Id743b9bfb83e4424f239e05dc0e731fc818f6468
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 1998 - Fixing Bridge Set-Controller operation failure

If Controller-Target already exist in the Controller table, the existing logic in setOFController
fails badly due to a very basic bug of updating a wrong table.

If the Target exist in the Controller table, the updateRow must happen only on the Bridge Table
and Not on Controller Table. That is the root-cause of the issue seen recently.

While reviewing this bug, I felt that the logic sorrounding this is unncessarily complex and I took
this opportunity to clean it a bit as well.

Change-Id: I14cd38759c16f8b444d2d14bd0b83d1df5a3b45d
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Add missing Order and Key to InstructionBuilders

Fixes bug 1982

Change-Id: Iea2a4ed1db2d9099e2dd81fc99685db505cdc521
Signed-off-by: Dave Tucker <djt@redhat.com>

Bug 1979 - Karaf : odl-adsal-compatibility feature needs to be pulled in automatically for odl-adsal-openstack

Change-Id: Ic395e8b4dd36cf96ebcd81daa8441ef6295a06c8
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Fix ARP Responder Actions

Fixes bug 1980

Change-Id: Iac673f7022b4059399b93e21ed4d1ce73d4ff99d
Signed-off-by: Dave Tucker <djt@redhat.com>

Bug 1972 - Flows failed to get programmed in a very random fashion.

Fixing it by introducing a little bit of a delay in writeFlow. This solves the pipeline flow programming woes.
Also eventdispatcher quits if there is atleast 1 exception. This can result in event queue backing up completely.

Change-Id: Ifc8a5d16e4ae332281b6f2ea8e99788dc8c42a49
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1897 - Implementing NeutronLoadBalancerPoolAware interface

1. Adding LBaaSPoolHandler class and changes to Activator
2. Allowing any order of VIP and Pool creation, instead of Pool
   and members first as it was implemented earlier.
3. Removing hack in LBaaSPoolMemberHandler member deletion and
   recomputing indices inline without enqueuing another event.

Note: With current implementation:
- It is possible to have more than 1 VIP per pool
- Create pool and VIP in any order
- There can only be 1 VIP per subnet.
- Two pools cannot share the same VIP.

Change-Id: I38d2adf07b70393a51d5ceaa467022426f3146fc
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Fixing Bug 1900 and 1908

Updating LBaaSPoolMemberHandler to process member add/delete correctly.
Previously the rules were not pushed or deletede properly.

Also committing the index subtraction in LoadBalancerService that was
not merged properly in the earlier commit.

Change-Id: If367895407a284333a0438ae76312063fe3d8ded
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Fixing Bug 1858 and Bug 1673 with changes in net-virt package

1. Adding support for pool-id based on fix that went into the controller/
northbound/networkconfig/neutron for fixing Bug 1673

2. Fixing issue where LB pool member creation / deletion fails when VIP
isn't created yet

3. Incorrect handling of the events (missing "break" in switch statement)

4. Adding missing Activator .setInterface for LBaaS handlers

Change-Id: Ied854fe4f44c839a1e46036e625b7fb3cf3111cc
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Bug 1890 - Fixing NX-Multipath action plugin

1. Setting right type for Dst as DstChoice
2. Updating convertor class to do right translation between OFJava and SAL
3. Updating ActionUtil call that uses the NX-Multipath action

Change-Id: Id226bab612cd3fa0c1243a00955e5a187fd7706a
Signed-off-by: Srini Seetharaman <srini.seetharaman@gmail.com>

Merge "Bug 1896: L3 router interface not being installed"

Bug 1909: fix maven-bundle-plugin version

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

Bug 1896: L3 router interface not being installed

Fix code path where tenant instance is added to node after router interface
is created.

Patch 2: code review. Thanks Mr. T!  :)

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

Bug 1889 - Adding the missing odl-openflowplugin-flow-services feature to odl-ovsdb-openstack feature

Change-Id: I4ab2ff86deae6c82a0d39f28169e1f31fddbc9b0
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Reording bundle dependencies in features.xml to solve Bug 1887

Change-Id: I475b9c486056d4eb8b80a8fd3be6406ad9f868e6
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1885: VM ingress rule is not installed for vlan networking

Related to Bug 1421 in openflowplugin where changes were made to how the vlan related match and actions are implemented. The current openflowplugin requires that the vlan match with present = false be added as a match before the mod_vlan_vid action will work. The patch adds the match condition.

There was an existing method to add the vlan vid and present flag. The method was enahanced to allow setting the present flag to true or false.

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

Bug 1825 - L2Fwding service should not inherit actions from the AbstractServiceInstance

Due to the Write-Actions vs Apply-Actions issue, L2Fwd service is moved to the end of the pipeline.
When it is moved, it should not inherit the Drop-flow from AbstractServiceInstance parent.

Change-Id: I14acc18ca0e9a9485d2cfcea53a4a0910f9db35e
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1864 - Use unique flow-id for AbstractService pipeline flows

Change-Id: I537436bdaad7bbea44ebe49b999d2dfd45f71ce5
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Create 3 new bundles for config files

Fixes bug 1823

Change-Id: I24d206838e07c3b8f5529d9daecc0e6112f0bfc8
Signed-off-by: Dave Tucker <djt@redhat.com>

Add config file for nicira-extension to karaf distribution

Partially fixes bug 1823

Change-Id: I55ac45e2c3d4c6fa187260d839d3824f513c5705
Signed-off-by: Dave Tucker <djt@redhat.com>
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1844 : Callback from neutron's router interface to be handled via neutron port events

In the absence of explicit router interface add/remove callback, check the interface
owner of the neutron port and determine if that represents a router interface. From there,
simply map the event as the expected router interface event.

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

Merge "Bug 1823 : Added karaf bundle for 43-openflowjava-nx-api-config.xml"

Merge "Bug 1823 : Adding Karaf openflowjava-nx-config bundle"

Bug 1823 : Added karaf bundle for 43-openflowjava-nx-api-config.xml

Change-Id: I982a281640112f5e6ac023a0763024664189b66c
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1823 : Adding Karaf openflowjava-nx-config bundle

Patch#4: Fixed a few more missing items that makes it integration-friendly
Patch#3: forgot I had dskiptests aliased from long build times.
This builds :0
Patch2: Deleting a config file a config file from before
we realized it needed to be new bundles.

Change-Id: I9cb6fe69eadc8df9bcffebfc3e15639e491db662
Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1824 : OpenFlow13 Protocol plugin is made the default. Also Karaf edition doesnt support the legacy openflow protocol plugin.

Change-Id: I7ae3ea575f0c92a9da13176f3291a4f920d8cb34
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 1822 -  Adding the missing karaf distribution

Change-Id: I5c46bc70eb28f21420c6d441672fcec9cf23b503
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

Bug 960 : Avoid adding redundant Openflow Controller entries

* Added IT for reproducing the problem;
* Enhanced ConfigurationService.setOFController() to detect duplicate
  targets and update rows instead of adding new ones.

Log: https://gist.github.com/anonymous/4ce9b2abdecda3c5e7fa

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

Merge "Bug 1799: Fixed broken Vagrantfile URL"