sfc.git
8 years agoFix for bug 6072: race condition in test SfcIpv4PacketInHandlerTest.pktInPurgeBuffering 23/40423/2
Diego Granados [Thu, 16 Jun 2016 07:17:52 +0000 (09:17 +0200)]
Fix for bug 6072: race condition in test SfcIpv4PacketInHandlerTest.pktInPurgeBuffering

Change-Id: I951728c647c6cd27e1a130ae0de608da57113e4d
Signed-off-by: Diego Granados <[email protected]>
8 years agoWrite openflow flows to datastore in a single transaction per RSP 48/39648/3
Diego Granados [Fri, 13 May 2016 10:52:18 +0000 (12:52 +0200)]
Write openflow flows to datastore in a single transaction per RSP

- Much faster (3x faster on RSP creation; 4x faster on deletion)
- Transactionality will guarantee flow coherence even in the
  event of errors during writeup / deletion
- Initial work by Brady Johnson <[email protected]>

Change-Id: I49ba138bcb13cd43566968ece6e318bb0417d542
Signed-off-by: Diego Granados <[email protected]>
8 years agoFix for Bug 5879 - Wrong run-time check for variable value 01/39301/10
Suvitha Balu [Tue, 24 May 2016 06:33:55 +0000 (12:03 +0530)]
Fix for Bug 5879 - Wrong run-time check for variable value

Change-Id: I1ea76572dc40fd634070f4bfa2b7718ca4db1be8
Signed-off-by: Suvitha Balu <[email protected]>
8 years agoRename sfcofl2_demo to sfc-openflow-renderer_demo 72/39772/2
Jose-Santos Pulido Garcia [Thu, 2 Jun 2016 14:32:02 +0000 (16:32 +0200)]
Rename sfcofl2_demo to sfc-openflow-renderer_demo

This patch does not modify code at all.  Only paths and a few comments
have been modified.

Change-Id: I8c6e6d35934e6669d8353d6dc8fc24e2d5038a9c
Signed-off-by: Jose-Santos Pulido Garcia <[email protected]>
8 years agoMerge "Load karaf features during demo"
Reinaldo Penno [Mon, 6 Jun 2016 05:19:42 +0000 (05:19 +0000)]
Merge "Load karaf features during demo"

8 years agoupdated gitignore for local log files 60/39860/1
Keith Burns (alagalah) [Sun, 5 Jun 2016 16:12:23 +0000 (09:12 -0700)]
updated gitignore for local log files

Change-Id: I9791dbe8c18f49c8371664d1042fc6f6cdc5c5b5
Signed-off-by: Keith Burns (alagalah) <[email protected]>
8 years agoLoad karaf features during demo 99/39299/5
Guo Ruijing [Mon, 23 May 2016 16:19:02 +0000 (16:19 +0000)]
Load karaf features during demo

Change-Id: I4d2d90059b025dfcfc2ea6081cc2bca0f8b3d4ea
Signed-off-by: Guo Ruijing <[email protected]>
8 years agoIntroduce IOS-XE (Netconf) renderer for SFC 02/38402/13
Vladimir Lavor [Tue, 10 May 2016 13:30:30 +0000 (15:30 +0200)]
Introduce IOS-XE (Netconf) renderer for SFC

Signed-off-by: Vladimir Lavor <[email protected]>
Change-Id: I3ee145fa0a4e5e9d4da7035f7d47d1add5ee011c

8 years agoFix SfcOfRendererDataListener's table offset check 65/39265/3
Jose-Santos Pulido Garcia [Mon, 23 May 2016 11:01:42 +0000 (13:01 +0200)]
Fix SfcOfRendererDataListener's table offset check

SfcOfRendererDataListener.processConfig(...) used the wrong magic
number.

Bug: 5415
Change-Id: I1cb1e9964eb3528a413a679e93e9318feddbf8f9
Signed-off-by: Jose-Santos Pulido Garcia <[email protected]>
8 years agoRename sfcofl2 to sfc-openflow-renderer 04/39004/9
Jose-Santos Pulido Garcia [Wed, 18 May 2016 09:18:11 +0000 (11:18 +0200)]
Rename sfcofl2 to sfc-openflow-renderer

Directory sfcofl2 is renamed to sfc-renderers/sfc-openflow-renderer.
Everything in sfcofl2 is renamed accordingly.

Feature odl-sfcofl2 is marked as deprecated. It depends on the new
odl-sfc-openflow-renderer feature.

Change-Id: I1fd74a04629dd31df1348b794479413d11d5f80f
Signed-off-by: Jose-Santos Pulido Garcia <[email protected]>
8 years agoFix wrong run-time check on variable in SfcScfOfProcessor.java 66/38666/3
ecejjar [Wed, 11 May 2016 12:51:43 +0000 (12:51 +0000)]
Fix wrong run-time check on variable in SfcScfOfProcessor.java

Bug: 5871
 - Patch-set 2: added solution to bug 5879

Change-Id: I4733d2874d4a097ff155f4e0dd835c644b8f32c5
Signed-off-by: ecejjar <[email protected]>
9 years agoRSP manager yang model for SFC 22/38222/8
Vladimir Lavor.com [Fri, 29 Apr 2016 09:44:27 +0000 (11:44 +0200)]
RSP manager yang model for SFC

Change-Id: Idc12ac53b48e235293256bc522949a2ff25d1e29
Signed-off-by: Vladimir Lavor <[email protected]>
9 years agoAdd sfc-renderers pom module 98/38598/1
Jose-Santos Pulido Garcia [Mon, 9 May 2016 16:20:43 +0000 (18:20 +0200)]
Add sfc-renderers pom module

The sfc-renderers module will group the RSP renderers (including the
to-be-renamed sfcofl2).

Change-Id: I04776e6fa5f1a4680e1c266c8fa321d6087ffa9d
Signed-off-by: Jose-Santos Pulido Garcia <[email protected]>
9 years agoRemove maskLength field references in LISP 84/38184/1
Lorand Jakab [Thu, 28 Apr 2016 06:25:36 +0000 (09:25 +0300)]
Remove maskLength field references in LISP

The maskLength field of the MappingRecord object in lispflowmapping was
deprecated in Beryllium and removed in Boron. The maskLength is now part
of the Eid object, so having a separate (unused) maskLength field is
both redundant and confusing.

Change-Id: Iea6be2b39305e75ed2f324f6f066058fd5c740a2
Signed-off-by: Lorand Jakab <[email protected]>
9 years agoDerive karaf distribution pom from karaf-parent 69/38069/2
Tom Pantelis [Mon, 25 Apr 2016 17:51:36 +0000 (13:51 -0400)]
Derive karaf distribution pom from karaf-parent

This picks up the recent changes to the karaf distro from a common
place.

Change-Id: Ie840b7a99e5d84eb95cdc450f84ddce137fa1638
Signed-off-by: Tom Pantelis <[email protected]>
9 years agoSupport building with org.json 20090211 28/36728/3
Stephen Kitt [Thu, 24 Mar 2016 10:54:26 +0000 (11:54 +0100)]
Support building with org.json 20090211

If we revert to org.json 20090211 (see
https://git.opendaylight.org/gerrit/36537 for details), we need to
handle JSONException which is a checked exception in that version.
This change is forwards-compatible.

Change-Id: Ia0696398e48cab1ac1525f02b95415914f750380
Signed-off-by: Stephen Kitt <[email protected]>
9 years agoUse https for Nexus in SFC project 09/37509/4
Miguel Angel Munoz Gonzalez [Tue, 12 Apr 2016 16:52:07 +0000 (18:52 +0200)]
Use https for Nexus in SFC project

Change URLs for Nexus release and snapshot in pom.xml

Change-Id: Idcf254328d59a3d72f848d667eb0521e48654896
Signed-off-by: Miguel Angel Munoz Gonzalez <[email protected]>
9 years agoDo not deploy the karaf artifact 47/36347/2
Thanh Ha [Wed, 16 Mar 2016 22:26:31 +0000 (18:26 -0400)]
Do not deploy the karaf artifact

The karaf artifact is only used for testing. It does not need to be
released to the world.

Change-Id: Ic95dc69756f72cc22d55128f38b8b38e074563eb
Signed-off-by: Thanh Ha <[email protected]>
9 years agoMore feature properties clean-up 79/35479/1
Stephen Kitt [Fri, 26 Feb 2016 17:19:16 +0000 (18:19 +0100)]
More feature properties clean-up

These slipped through the cracks...

Change-Id: I89e68f7331f698d7c12ef41dd61779ba0614638a
Signed-off-by: Stephen Kitt <[email protected]>
9 years agoMerge "Clean up dependency properties"
Reinaldo Penno [Thu, 25 Feb 2016 17:21:52 +0000 (17:21 +0000)]
Merge "Clean up dependency properties"

9 years agoMerge "BUG 5170 - statistics should contain timestamp for data historization"
Reinaldo Penno [Thu, 25 Feb 2016 17:21:38 +0000 (17:21 +0000)]
Merge "BUG 5170 - statistics should contain timestamp for data historization"

9 years agoClean up dependency properties 61/31161/9
Stephen Kitt [Thu, 10 Dec 2015 18:42:14 +0000 (19:42 +0100)]
Clean up dependency properties

Migrate to features-parent for features-sfc and use that to drop a
number of dependency properties (pulling in the dependency management
from odlparent).

Remove obsolete properties.

Note that this upgrades PowerMock to 1.6.4 (odlparent now provides
dependency management for Mockito and PowerMock since they need to be
upgaded in sync).

Change-Id: Ib0fc1a63f16867082bb3eb12ee51cc89ecc7a3bc
Signed-off-by: Stephen Kitt <[email protected]>
9 years agoBug 4401:move access-lists-state from ietf-acl.yang 37/33537/6
Ruijing Guo [Tue, 26 Jan 2016 00:31:12 +0000 (00:31 +0000)]
Bug 4401:move access-lists-state from ietf-acl.yang

Change-Id: I20e670ee755d82585f72f681a23acf7d391c09d8
Signed-off-by: Ruijing Guo <[email protected]>
Signed-off-by: Robert Varga <[email protected]>
9 years agoCheckstyle Issues in VNFM 26/34626/1
Reinaldo Penno [Sun, 14 Feb 2016 07:06:44 +0000 (23:06 -0800)]
Checkstyle Issues in VNFM

- Compilation actually fails due to these
- Two checkstyle errors

Change-Id: I066c44f6fe343f8c233e95911d22c66272c4c0ca
Signed-off-by: Reinaldo Penno <[email protected]>
9 years agoBUG 5170 - statistics should contain timestamp for data historization 63/34163/1
Matej Perina [Tue, 2 Feb 2016 09:24:16 +0000 (10:24 +0100)]
BUG 5170 - statistics should contain timestamp for data historization

Change-Id: I8ca833ef7053cf625dcc166f06560a99bd9e8f84
Signed-off-by: Matej Perina <[email protected]>
9 years agoMerge "UT Adding PacketInHandler UT and misc cleanup"
Keith Burns [Fri, 5 Feb 2016 11:51:59 +0000 (11:51 +0000)]
Merge "UT Adding PacketInHandler UT and misc cleanup"

9 years agoBUG 5078 : Fixing AppCoexistence table offsets 71/33471/6
Brady Johnson [Mon, 25 Jan 2016 10:38:09 +0000 (11:38 +0100)]
BUG 5078 : Fixing AppCoexistence table offsets

- https://bugs.opendaylight.org/show_bug.cgi?id=5078
- the offsets werent compensating for the following:
  -- TABLE_INDEX_CLASSIFIER=0 - which is not used for AppCoexistence
  -- TABLE_INDEX_TRANSPORT_INGRESS=1 - which is table 0 for AppCoexistence
  Example: tableBase=20, TABLE_INDEX_PATH_MAPPER=2, should return 20
- Also fixed table egress, so it can be set to 0
- Added SfcL2OfRendererDataListenerTest

Change-Id: Ic9ade6b903153372ef77bc2a3f8b24868f86fa4a
Signed-off-by: Brady Johnson <[email protected]>
9 years agoUT Adding PacketInHandler UT and misc cleanup 67/33567/2
Brady Johnson [Tue, 26 Jan 2016 13:55:04 +0000 (14:55 +0100)]
UT Adding PacketInHandler UT and misc cleanup

- added SfcIpv4PacketInHandlerTest.java
- removed SfcL2FlowWriterTest.java and use mockito instead

Change-Id: I112babce1657d0f321a548edb5c2670492c5574d
Signed-off-by: Brady Johnson <[email protected]>
9 years agoBug 5072: Fail to create ACL 37/32737/19
Ruijing Guo [Thu, 4 Feb 2016 23:02:46 +0000 (07:02 +0800)]
Bug 5072: Fail to create ACL

Change-Id: Ib002e91ae3e074f6bbfbeda816078498914203a6
Signed-off-by: Ruijing Guo <[email protected]>
9 years agoMerge "Bug 4977 authentication with tacker fails"
Keith Burns [Sat, 23 Jan 2016 23:28:05 +0000 (23:28 +0000)]
Merge "Bug 4977 authentication with tacker fails"

9 years agoBump yangtools to 1.0.0-SNAPSHOT 63/33263/2
Thanh Ha [Thu, 21 Jan 2016 20:45:25 +0000 (15:45 -0500)]
Bump yangtools to 1.0.0-SNAPSHOT

Change-Id: Ie3b3b3f01bbfc2fb2ad311784fc76bd5229ab2cc
Signed-off-by: Thanh Ha <[email protected]>
9 years agoMerge "Append ETH+NSH and VxLAN-gpe+NSH send as well as ETH+NSH forward features...
Reinaldo Penno [Thu, 21 Jan 2016 00:42:33 +0000 (00:42 +0000)]
Merge "Append ETH+NSH and VxLAN-gpe+NSH send as well as ETH+NSH forward features to vxlan_tool.py"

9 years agoBug 4977 authentication with tacker fails 41/32941/1
Michal Cmarada [Mon, 18 Jan 2016 10:22:28 +0000 (11:22 +0100)]
Bug 4977 authentication with tacker fails

Change-Id: Ic1cda403933d3be444e97fdb6211d4d21e5ff85e
Signed-off-by: Michal Cmarada <[email protected]>
9 years agoDont create match any flow on Table 0 for AppCoexist 79/32879/1
Brady Johnson [Fri, 15 Jan 2016 22:19:13 +0000 (23:19 +0100)]
Dont create match any flow on Table 0 for AppCoexist

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

Change-Id: If7c122ea6ff79b5a17f72549a198ce675101118b
Signed-off-by: Brady Johnson <[email protected]>
9 years agoBump versions by 0.1.0 for next dev cycle 42/32742/1
Thanh Ha [Fri, 15 Jan 2016 07:34:16 +0000 (02:34 -0500)]
Bump versions by 0.1.0 for next dev cycle

Change-Id: I5597fa52c658f7fa1dd96b089b091373cbf80781
Signed-off-by: Thanh Ha <[email protected]>
9 years agoMerge "implementation of VNFM SPI for Tacker use case"
Keith Burns [Thu, 14 Jan 2016 20:01:47 +0000 (20:01 +0000)]
Merge "implementation of VNFM SPI for Tacker use case"

9 years agoMerge "Use merge when adding sff bridge"
Brady Johnson [Thu, 14 Jan 2016 19:56:19 +0000 (19:56 +0000)]
Merge "Use merge when adding sff bridge"

9 years agoUse merge when adding sff bridge 16/32616/2
Sam Hague [Thu, 14 Jan 2016 19:06:49 +0000 (14:06 -0500)]
Use merge when adding sff bridge

The current code uses a put transaction to add the sff bridge to the datastore. This causes the existing bridge to be erased and then recreated. This causes any existing flows already programed to be removed.

Patch set 2: Add fix for unit-test

Change-Id: I1bf223a31fa29c31c8171877fb8b6149885eb93f
Signed-off-by: Sam Hague <[email protected]>
9 years agoimplementation of VNFM SPI for Tacker use case 37/32137/8
Michal Cmarada [Thu, 14 Jan 2016 15:29:29 +0000 (16:29 +0100)]
implementation of VNFM SPI for Tacker use case

Change-Id: I59de026fd8ec60f77ddb41e6bda480fb22e07d12
Signed-off-by: Michal Cmarada <[email protected]>
9 years agosfc-vnfm-spi 33/30933/9
Michal Cmarada [Tue, 12 Jan 2016 12:05:57 +0000 (13:05 +0100)]
sfc-vnfm-spi

Change-Id: I6d95e49e2d77c5a47cc434dfabb47667f7acaad9
Signed-off-by: Keith Burns (alagalah) <[email protected]>
Signed-off-by: Michal Cmarada <[email protected]>
9 years agoAugmenting SF DPL with OVS port name 82/32282/3
Brady Johnson [Thu, 7 Jan 2016 16:58:44 +0000 (17:58 +0100)]
Augmenting SF DPL with OVS port name

- Bugzilla: https://bugs.opendaylight.org/show_bug.cgi?id=4893
- Patch Set 2 : rebase, address code review comments,
                and add resubmit for table egress
- Patch Set 3 : modify unit tests for App Coexistence resubmit table

Change-Id: I2174bc9a25f7798b57afb998b853a545b0fe8fb2
Signed-off-by: Brady Johnson <[email protected]>
9 years agoAppend ETH+NSH and VxLAN-gpe+NSH send as well as ETH+NSH forward features to vxlan_to... 93/32393/1
Yi Yang [Tue, 12 Jan 2016 06:36:02 +0000 (14:36 +0800)]
Append ETH+NSH and VxLAN-gpe+NSH send as well as ETH+NSH forward features to vxlan_tool.py

- Support ETH+NSH packet forward
- Support ETH+NSH and VxLAN-gpe+NSH packet send
- Add --no-swap-ip option to disable source and destination IP swap for some use cases
- Wrap all the prints to functions
- Clean up duplicate code block

Change-Id: I11302176ad1d568932d575e5385472834b756799
Signed-off-by: Yi Yang <[email protected]>
9 years agoMerge "Update sfclisp to use ServicePath EIDs"
Reinaldo Penno [Mon, 11 Jan 2016 21:56:33 +0000 (21:56 +0000)]
Merge "Update sfclisp to use ServicePath EIDs"

9 years agoSFC App Coexistence 00/32100/5
Brady Johnson [Mon, 4 Jan 2016 19:14:15 +0000 (20:14 +0100)]
SFC App Coexistence

    - This patch fixes a previously reverted patch:
      https://git.opendaylight.org/gerrit/#/c/31509/
    - The base table functionality was already implemented, which
      offsets the tables.
    - The TransportIngress table will always be table 0, even if
      the base table has been set.
    - All Goto Table Instructions must also use the table offset.
    - The LastHop TransportEgress table should now goto an Egress
      table instead of outputing to a switch port for Chain Egress.
    - Added relevant Unit Tests
    - For now just match on NSH NSP for vxlan nsh transport Ingress.
      In a later patch we will match on ingress switch port.
    - Patch-set 4 : remove IP from vxlan nsh transport Ingress flow.

Outstanding issues with this patch:
https://bugs.opendaylight.org/show_bug.cgi?id=4929

Change-Id: Ic312b91dedd41b90a677ce680aab5b56a1f9f6f7
Signed-off-by: Brady Johnson <[email protected]>
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoUpdate sfclisp to use ServicePath EIDs 42/32342/1
Florin Coras [Mon, 11 Jan 2016 08:23:24 +0000 (09:23 +0100)]
Update sfclisp to use ServicePath EIDs

Update sfclisp to insert ServicePath to ELP mappings, instead of
per ACE SourceDests, for each RSP.

Change-Id: Ic8378e050a83d50b8a506e574c2fd34b75d6b892
Signed-off-by: Florin Coras <[email protected]>
9 years agoBug 4131 - SFF has no initialization flows 48/29848/11
Tomas Cechvala [Wed, 18 Nov 2015 11:25:43 +0000 (12:25 +0100)]
Bug 4131 - SFF has no initialization flows

SFFs are still considered as active even after initialization
flows get removed. The flows are cleared when a last RSP is
deleted. Fixed by removing cleared SFFs from list of
initialized forwarders.

Change-Id: I8d5646760ac9e373dee46599541adedbf39dc786
Signed-off-by: Tomas Cechvala <[email protected]>
9 years agoMerge "Revert "SFC App Coexistence""
Keith Burns [Mon, 4 Jan 2016 14:51:33 +0000 (14:51 +0000)]
Merge "Revert "SFC App Coexistence""

9 years agoRevert "SFC App Coexistence" 80/32080/1
Keith Burns [Mon, 4 Jan 2016 14:51:20 +0000 (14:51 +0000)]
Revert "SFC App Coexistence"

This reverts commit 1a1b94e9e2b5c611307c0eb91815a95b1b864a2c.

Change-Id: If4de4c43aa3888936ed04c48fb2e673003b24a46
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoMerge "Remove Classifier State from sfc-ui"
Reinaldo Penno [Mon, 4 Jan 2016 04:49:57 +0000 (04:49 +0000)]
Merge "Remove Classifier State from sfc-ui"

9 years agoMerge "Revert "SFC App Coexistence""
Keith Burns [Mon, 4 Jan 2016 03:09:35 +0000 (03:09 +0000)]
Merge "Revert "SFC App Coexistence""

9 years agoRevert "SFC App Coexistence" 56/32056/1
Keith Burns [Mon, 4 Jan 2016 03:09:16 +0000 (03:09 +0000)]
Revert "SFC App Coexistence"

This reverts commit 1a1b94e9e2b5c611307c0eb91815a95b1b864a2c.

Change-Id: Icbad1e79f83427573d26923748bec79ff1263924
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoMerge "SFC Demo Rest Regression Fixes"
Keith Burns [Mon, 4 Jan 2016 02:27:05 +0000 (02:27 +0000)]
Merge "SFC Demo Rest Regression Fixes"

9 years agoMerge "SFC App Coexistence"
Keith Burns [Mon, 4 Jan 2016 02:26:41 +0000 (02:26 +0000)]
Merge "SFC App Coexistence"

9 years agoSFC Demo Rest Regression Fixes 83/31883/17
Reinaldo Penno [Sat, 26 Dec 2015 00:41:51 +0000 (16:41 -0800)]
SFC Demo Rest Regression Fixes

- The idea of this commit is to allow a multi-SFf, multi-SFF demo without
  the need for VMs. All in software under a single interface. This allows
  for much quicker demos and experimentation.
- In order to have multi-SFFs the Agent now constructs data paths on a per SFF basis. Each
  thread looks up the net hops on its own data path.
- sfc_agent.py became too big. Moved all ODL apis into a separate file. Now sfc_agent
  only has the REST server and related functions
- BUG: End of chain packet had wrong offset.
- BUG: More fixes related to Yang model changes
- BUG: NSH packet type should come from NSH header and not global arg
- BUG: Fixed find_sf_locator function. Too many scope problems.
- BUG: Fixed all JSON messages related to demo regression
- BUG: Fixed initial agent info message
- Still need to work on SB Rest side. It will be another commit
- Slightly improved Agent start script by allowing passing ODL IP:port
- Implemented requirements.txt python file

Multi-SFF, multi-SF passes

INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 6008):
INFO:sfc.common.services:dpi service received packet from ('192.168.1.7', 30001):
INFO:sfc.common.services:dpi service received packet from ('192.168.1.7', 30001):
INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 40001):
INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 30001):
INFO:sfc.common.services:firewall service received packet from ('192.168.1.7', 30002):
INFO:sfc.common.services:firewall service received packet from ('192.168.1.7', 30002):
INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 40002):
INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 30002):
INFO:sfc.common.services:napt44 service received packet from ('192.168.1.7', 30003):
INFO:sfc.common.services:napt44 service received packet from ('192.168.1.7', 30003):
INFO:sfc.common.services:SFF Server service received packet from ('192.168.1.7', 40003):
ERROR:sfc.common.services:Could not determine next service hop. SP: 934, SI: 252
INFO:sfc.common.services:End of Chain. Sending packet to 200.200.200.1 20000

Change-Id: I274bed3b67f70a1a394b5063edd4bed56dd95ee1
Signed-off-by: Reinaldo Penno <[email protected]>
9 years agoMove SfcOvsPortUtils to SfcOvsUtil 21/31921/3
Ruijing Guo [Mon, 28 Dec 2015 22:03:15 +0000 (22:03 +0000)]
Move SfcOvsPortUtils to SfcOvsUtil

Change-Id: I1595405edf26d433d22efa03d08643508e3b02b8
Signed-off-by: Ruijing Guo <[email protected]>
9 years agoSFC App Coexistence 09/31509/6
Brady Johnson [Wed, 16 Dec 2015 12:37:59 +0000 (13:37 +0100)]
SFC App Coexistence

- The base table functionality was already implemented, which
  offsets the tables.
- The TransportIngress table will always be table 0, even if
  the base table has been set.
- All Goto Table Instructions must also use the table offset.
- The LastHop TransportEgress table should now goto an Egress
  table instead of outputing to a switch port for Chain Egress.
- Added relevant Unit Tests
- Patch Set 3 - rebase
- Patch Set 4 - minor fixes
- Patch Set 6 - Added configurable udpVxlanPort to VxlanTransportIngress flows

Change-Id: I8755334ab146a04aa0acaf4bee50c9a3e41af23a
Signed-off-by: Brady Johnson <[email protected]>
9 years agoBug 4843 - SFC Basic Rest Regression broken after Yang models change 75/31875/2
Reinaldo Penno [Fri, 25 Dec 2015 00:04:58 +0000 (16:04 -0800)]
Bug 4843 - SFC Basic Rest Regression broken after Yang models change

- This first patch fixes all JSON messages for the basic rest regression
- More fixes to come
- Fixed typo

Change-Id: I122a343bb9b9daff81fe157fbcf0aa2132b965c5
Signed-off-by: Reinaldo Penno <[email protected]>
9 years agoMerge "SFF Form"
Reinaldo Penno [Sun, 20 Dec 2015 08:42:01 +0000 (08:42 +0000)]
Merge "SFF Form"

9 years agoMerge "Refactoring RspProcessor"
Keith Burns [Sat, 19 Dec 2015 22:27:22 +0000 (22:27 +0000)]
Merge "Refactoring RspProcessor"

9 years agoClean up SfcOpenflowUtilsTest and re-enable all tests 30/31530/2
Stephen Kitt [Thu, 17 Dec 2015 17:41:31 +0000 (18:41 +0100)]
Clean up SfcOpenflowUtilsTest and re-enable all tests

nextHopGroupIdArray isn't used, remove it.
(int) random() is always 0 (because of rounding), use the default
Random() constructor.
Drop redundant casts.
static methods are final, drop the redundant final modifier.
All the parameter creation methods are used but untrackable, suppress
the unused warnings.
Remove commented code.
Fix shouldThrowExceptionForCreateSetAction() and re-enable it.

Change-Id: I6b14f161eb3c96d5170030b34bc0c6cd0776cae1
Signed-off-by: Stephen Kitt <[email protected]>
9 years agoRefactoring RspProcessor 59/30859/6
Brady Johnson [Sat, 5 Dec 2015 20:54:36 +0000 (21:54 +0100)]
Refactoring RspProcessor

- Moved convoluted logic from configureIngress() and
  configureEgress() to individual methods for each table.
- Transport specific (mpls, nsh, vlan) logic has been
  moved to a newly created class hierarchy of SfcRspProcessors.
- RspProcessorTest updated to reflect changes. Previously
  there were several duplicate calls to the same Flow
  Programmer methods being made, this no longer occurs.

Change-Id: I1ef2b3d5b20b3374640849ca093bc838916629df
Signed-off-by: Brady Johnson <[email protected]>
9 years agoRemove Classifier State from sfc-ui 51/30951/3
Stanislav Jamrich [Thu, 17 Dec 2015 09:34:47 +0000 (10:34 +0100)]
Remove Classifier State from sfc-ui

Classifier state was removed in https://git.opendaylight.org/gerrit/#/c/28584/
Fixed classifier state service removal

Change-Id: Ib6114ce74ef2c7fd14bc74f68170759f10ef415a
Signed-off-by: Ruijing Guo <[email protected]>
Signed-off-by: Stanislav Jamrich <[email protected]>
9 years agoCleaning up SfcL2FlowProgrammerOFimpl 55/30555/7
Brady Johnson [Thu, 3 Dec 2015 14:08:51 +0000 (15:08 +0100)]
Cleaning up SfcL2FlowProgrammerOFimpl

- instead of creating a thread class for each type
  of table modification, just create the flow and
  have one thread class for writing to, and another
  for removing from the data-store
- some simple API and logic cleanups
- more cleanups to SfcL2FlowProgrammerOFimpl coming
  in the RspProcessor refactor:
  https://git.opendaylight.org/gerrit/#/c/30859/
- PatchSet 3: Adding javadoc
- PatchSet 4: Rebase
- PatchSet 5: Rebase
- PatchSet 6: Minor changes from code review comments

Change-Id: I0716e3e759ddf5c985b51ce2f0a770349ee51cd4
Signed-off-by: Brady Johnson <[email protected]>
9 years agoMerge "sfc.sfc_lisp.provider.api cleanup"
Keith Burns [Wed, 16 Dec 2015 23:55:22 +0000 (23:55 +0000)]
Merge "sfc.sfc_lisp.provider.api cleanup"

9 years agoMerge "Adding buffering for TCP Proxy PktIn packets"
Keith Burns [Wed, 16 Dec 2015 23:54:52 +0000 (23:54 +0000)]
Merge "Adding buffering for TCP Proxy PktIn packets"

9 years agoMerge "Add missing license headers"
Keith Burns [Wed, 16 Dec 2015 23:38:57 +0000 (23:38 +0000)]
Merge "Add missing license headers"

9 years agoMerge "Add SFC Standalone classifier demo"
Keith Burns [Wed, 16 Dec 2015 22:48:35 +0000 (22:48 +0000)]
Merge "Add SFC Standalone classifier demo"

9 years agosfc.sfc_lisp.provider.api cleanup 35/30135/4
Matej Perina [Wed, 2 Dec 2015 17:43:01 +0000 (18:43 +0100)]
sfc.sfc_lisp.provider.api cleanup

Change-Id: Ic7ec747ea10ef75e6133ddb3db195239021350e0
Signed-off-by: Matej Perina <[email protected]>
9 years agoAdding buffering for TCP Proxy PktIn packets 34/28934/4
Brady Johnson [Thu, 29 Oct 2015 10:39:54 +0000 (11:39 +0100)]
Adding buffering for TCP Proxy PktIn packets

- Avoids updating data store for every packet in a flow
- The buffer key is the src/dst IP
- buffer max time is 60 seconds

Change-Id: I5840740b78ba49848d604be3cba6c2012178ee06
Signed-off-by: Brady Johnson <[email protected]>
9 years agoMerge "BUG-4697: move features to top level"
Keith Burns [Wed, 16 Dec 2015 20:49:08 +0000 (20:49 +0000)]
Merge "BUG-4697: move features to top level"

9 years agoAdd missing license headers 81/31381/1
Thanh Ha [Tue, 15 Dec 2015 23:29:38 +0000 (18:29 -0500)]
Add missing license headers

Change-Id: I670f301d830bde100adb0657aafb2e5733f9028e
Signed-off-by: Thanh Ha <[email protected]>
9 years agoAdding UT for SFCOFL2 package: 10/30210/6
Ricardo Noriega [Wed, 25 Nov 2015 17:14:48 +0000 (18:14 +0100)]
Adding UT for SFCOFL2 package:

    - Checking if flows written in datastore are properly built

Change-Id: Ia475c2f5471226551913af1fc3a5a770ac28155b
Signed-off-by: Ricardo Noriega <[email protected]>
9 years agoSFF Form 51/31351/1
Stanislav Jamrich [Tue, 15 Dec 2015 14:30:34 +0000 (15:30 +0100)]
SFF Form

- implemented yang changes for SFF
- fixed some cosmetic issues

Change-Id: I1fb8b100381b68438acaee62eefbcbab18986f79
Signed-off-by: Stanislav Jamrich <[email protected]>
9 years agoBUG-4697: move features to top level 47/31347/1
Robert Varga [Tue, 15 Dec 2015 13:51:09 +0000 (14:51 +0100)]
BUG-4697: move features to top level

RFC6020 is explicit about where a feature can be defined
(https://tools.ietf.org/html/rfc6020#section-7.18.1). Fix the model so
it does not block yangtools enforcement patch.

Change-Id: I555cefeb39ed9c50904b16765fc9353cc9dcaef1
Signed-off-by: Robert Varga <[email protected]>
9 years agoAdd SFC Standalone classifier demo 45/31245/1
Ruijing Guo [Sun, 13 Dec 2015 21:35:01 +0000 (21:35 +0000)]
Add SFC Standalone classifier demo

Change-Id: I3d3d92ff5920b4993d6a0469f72500994df6ab03
Signed-off-by: Ruijing Guo <[email protected]>
9 years agoMerge "update according to yang model change"
Reinaldo Penno [Thu, 10 Dec 2015 09:10:34 +0000 (09:10 +0000)]
Merge "update according to yang model change"

9 years agoupdate according to yang model change 02/31102/1
Ruijing Guo [Thu, 10 Dec 2015 00:29:56 +0000 (00:29 +0000)]
update according to yang model change

Change-Id: I07aec182f93a9b060fffa8a6a0a641b0332e7f34
Signed-off-by: Ruijing Guo <[email protected]>
9 years agoMerge "SfcNetworkTopologyUtils cleanup"
Reinaldo Penno [Tue, 8 Dec 2015 20:08:06 +0000 (20:08 +0000)]
Merge "SfcNetworkTopologyUtils cleanup"

9 years agoSfcNetworkTopologyUtils cleanup 17/29917/2
Michal Cmarada [Tue, 8 Dec 2015 07:21:42 +0000 (08:21 +0100)]
SfcNetworkTopologyUtils cleanup

Change-Id: I2574ed432ea43062f47a566c7ab42a58edcedf23
Signed-off-by: Michal Cmarada <[email protected]>
9 years agoThe changes to this code were done to support the recent SFC demo done by 52/30952/1
Andre Fredette [Tue, 8 Dec 2015 03:56:03 +0000 (22:56 -0500)]
The changes to this code were done to support the recent SFC demo done by
Sam Hague and Tim Rozet.  Keith Burns also used a version of it in a
GBP-based demo.

This code was modified to
* run with Python 2.7
* swap the IP SA and DA when forwarding.
* Work for either UDP port 4790 or 6633
* Don't forward NSH frames unless service index is > 1
* Added verbose option to turn off prints when in forward mode

Options:
* -i: Interface to receive, and optionally send packets on
* -d: Mode: 'dump' or 'forward'.  Default is dump.
* -v: Verbose: 'on' or 'off'.  Default is 'on', and 'off' only works
      in 'forward' mode.

Example Use:
sudo python vxlan_tool.py -i 'eth1' -d 'forward' -v 'off'

Change-Id: I14ddefcd2bdde3c681f69878ad817f464cb520d4
Signed-off-by: Andre Fredette <[email protected]>
9 years agoAddition of SF DPL to SFF DPL mapping. 92/28392/7
Keith Burns (alagalah) [Wed, 14 Oct 2015 13:04:49 +0000 (06:04 -0700)]
Addition of SF DPL to SFF DPL mapping.

Change-Id: If1a6a61ae7b84868ba7f887825c6ce3d98a148fe
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoSFC Standalone Classifier 78/29478/15
Ruijing Guo [Tue, 1 Dec 2015 18:17:21 +0000 (18:17 +0000)]
SFC Standalone Classifier

1. Add unit test for SfcMatch
2. Add unit test for SfcScfOfScfDataListener
3. Add unit test for SfcScfOfScfProcessor
4. fix bug in SfcServicePathIdTest

Todo List:
1. add more unit tests
2. move SfcOvsPortUtils to sfc-ovs
3. move SfcNshHeader to sfc-provider

Change-Id: I86105872a9aa9a0763bec2a96cb7a84a18eb6034
Signed-off-by: Ruijing Guo <[email protected]>
9 years agoUpdate and re-enable sfclisp 86/30686/1
Florin Coras [Wed, 25 Nov 2015 14:46:34 +0000 (15:46 +0100)]
Update and re-enable sfclisp

Change-Id: I85913f3fd707e9ef8a031f3bd5d5e93190c83e13
Signed-off-by: Florin Coras <[email protected]>
9 years agoMerge "Remove sfclisp from build"
Keith Burns [Thu, 3 Dec 2015 23:08:02 +0000 (23:08 +0000)]
Merge "Remove sfclisp from build"

9 years agoRemove sfclisp from build 76/30576/1
Florin Coras [Thu, 3 Dec 2015 18:07:27 +0000 (19:07 +0100)]
Remove sfclisp from build

Change-Id: I43e679302da38eb807014e5403b7047472244b60
Signed-off-by: Florin Coras <[email protected]>
9 years agoSFC data model to config OpenFlow table offsets 36/30136/5
Brady Johnson [Tue, 24 Nov 2015 13:18:36 +0000 (14:18 +0100)]
SFC data model to config OpenFlow table offsets

- For now, the Sfc OpenFlow Renderer data model only
  has attributes for OpenFlow tables, but in the future
  more attributes can be added.
- Introduced SfcSynchronizer class to be able to synchronize
  FlowTable offset changes with Rsp modifications.
- Introduced SfcL2OfRendererDataListener, that listens for
  changes to Sfc OpenFlow Renderer data model changes.
- Not UnitTested yet, waiting for patch 29986 to be merged,
  after which SfcL2FlowProgrammerOFimpl UT will be refactored.
- TableEgress feature not implemented yet. I want to refactor
  SfcL2FlowProgrammerOFimpl first, which will make implementing
  the feature much easier.
- Patch Set 2 - rebase

Change-Id: I7c5ed97d68ea0e08beabeae601c4c24d944cf589
Signed-off-by: Brady Johnson <[email protected]>
9 years agoChange to classifier.py fixing issue with dict keys. 23/30523/1
Keith Burns (alagalah) [Thu, 3 Dec 2015 01:55:41 +0000 (17:55 -0800)]
Change to classifier.py fixing issue with dict keys.

Change-Id: Ib916375974be25e635187d7204ab2b838a675bb1
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoAllow socket reuse in IPTABLES classifier 13/30513/1
Keith Burns (alagalah) [Wed, 2 Dec 2015 22:02:44 +0000 (14:02 -0800)]
Allow socket reuse in IPTABLES classifier

Change-Id: I508361b3cbc7bcf95afbe6c8ec7e5c05d6ecf411
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoMerge "SFC UI - broken forms fix"
Reinaldo Penno [Wed, 2 Dec 2015 16:42:25 +0000 (16:42 +0000)]
Merge "SFC UI - broken forms fix"

9 years agoMerge "sfc_ovs.api cleanup"
Brady Johnson [Wed, 2 Dec 2015 15:57:15 +0000 (15:57 +0000)]
Merge "sfc_ovs.api cleanup"

9 years agosfc-provider.api cleanup 28/30128/5
Michal Cmarada [Wed, 2 Dec 2015 14:23:14 +0000 (15:23 +0100)]
sfc-provider.api cleanup

Change-Id: I96d63cafe10107033a8d9f12365d2fd5707c1a83
Signed-off-by: Michal Cmarada <[email protected]>
9 years agosfc_ovs.api cleanup 38/30138/2
Michal Cmarada [Wed, 2 Dec 2015 14:05:55 +0000 (15:05 +0100)]
sfc_ovs.api cleanup

Change-Id: I56e3652505ece37ac2c3a5c00f05b9ff0aa7f875
Signed-off-by: Michal Cmarada <[email protected]>
9 years agoSFC UI - broken forms fix 44/30444/3
Daniel Malachovsky [Wed, 2 Dec 2015 12:36:16 +0000 (13:36 +0100)]
SFC UI - broken forms fix

- ACL table now shows data
- add/edit ACL data is working
- fixed template directive to not rewrite existing data

Change-Id: Icc3d40a9962053f09e40d7834b5f3b1e994d68e1
Signed-off-by: Daniel Malachovsky <[email protected]>
Signed-off-by: Stanislav Jamrich <[email protected]>
Signed-off-by: Daniel Malachovsky <[email protected]>
9 years agoMove network topology APIs from sfc-provider to sfc-util 60/30460/1
Yi Yang [Wed, 2 Dec 2015 01:54:55 +0000 (09:54 +0800)]
Move network topology APIs from sfc-provider to sfc-util

This will utterly remove dependency on l2switch from
sfc-provider, network topology APIs are put into a bundle
sfc-network-topology-utils under sfc-util.

Change-Id: Ic5606d5e506d78e54cd96902f70e4838f8f4c170
Signed-off-by: Yi Yang <[email protected]>
9 years agoMerge "Change sfc-util for accommodating multiple bundles"
Reinaldo Penno [Tue, 1 Dec 2015 20:49:01 +0000 (20:49 +0000)]
Merge "Change sfc-util for accommodating multiple bundles"

9 years agoMerge "SfcUICosmeticChanges2"
Reinaldo Penno [Tue, 1 Dec 2015 19:53:59 +0000 (19:53 +0000)]
Merge "SfcUICosmeticChanges2"

9 years agoChange sfc-util for accommodating multiple bundles 37/28837/9
Yi Yang [Tue, 27 Oct 2015 10:39:04 +0000 (18:39 +0800)]
Change sfc-util for accommodating multiple bundles

Current sfc-util only has one bundle, it is actually
openflow utils, network topology utils will be moved
into this in order that sfc-provider won't depend on
l2switch. So this commit renames current sfc-util
bundle to sfc-openflow-utils and chnage sfc-util to
accommodate other utils.

Change-Id: I06575c283726e532b9a514444c6ea7a06178d912
Signed-off-by: Yi Yang <[email protected]>
9 years agoMerge "Remove executable bit on pom files"
Reinaldo Penno [Tue, 1 Dec 2015 18:45:04 +0000 (18:45 +0000)]
Merge "Remove executable bit on pom files"

9 years agoImplementation of Service Function Type Definitions 90/30090/8
Keith Burns (alagalah) [Mon, 23 Nov 2015 17:37:02 +0000 (09:37 -0800)]
Implementation of Service Function Type Definitions

Change-Id: I863dec458365b0175b42bda0357f429186f008a6
Signed-off-by: Keith Burns (alagalah) <[email protected]>
9 years agoSfcUICosmeticChanges2 35/30435/1
Stanislav Jamrich [Tue, 1 Dec 2015 13:34:26 +0000 (14:34 +0100)]
SfcUICosmeticChanges2

- added ngTable search placeholder

Change-Id: I4671b496344a07a70770ec9c73046be6c847e3c5
Signed-off-by: Stanislav Jamrich <[email protected]>