sfc.git
8 years agovxlan_tool.py: support VxLAN-gpe + ETH + NSH 33/41533/3
Yi Yang [Fri, 8 Jul 2016 03:44:39 +0000 (11:44 +0800)]
vxlan_tool.py: support VxLAN-gpe + ETH + NSH

Change-Id: I490ccf9190198280e14916e16eb9edacd8bb422a
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
8 years agoDemo 103 Vagrant + Docker 81/42581/10
ericdia [Tue, 26 Jul 2016 15:03:40 +0000 (17:03 +0200)]
Demo 103 Vagrant + Docker

A version of sfc103 demo using just one Vagrant machine and six Docker
containers:

- The Vagrant machine hosts the ODL controller
- The Docker containers deployed also on the Vagrant machine
  (with  docker-compose) act as service nodes

In theory, this version of the demo requires less machine resources
(memory and cpu) than the original one.

Change-Id: I46870c35af3afbd760a40a21c166eb7cc96c8c96
Signed-off-by: ericdia <ricardo.diaz.campos@ericsson.com>
8 years agoRename sfc-genius provider package to impl 93/42993/3
Jaime Caamaño Ruiz [Tue, 2 Aug 2016 17:35:09 +0000 (19:35 +0200)]
Rename sfc-genius provider package to impl

It's a more appropiate name and avoids the export of any bundle

Change-Id: Ie039679f4fe849dadb2a91002159b4b69363b67c
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
8 years agoAdd configuration examples for SFC - Logical SFF 29/43129/2
eceujmm [Thu, 4 Aug 2016 15:33:03 +0000 (17:33 +0200)]
Add configuration examples for SFC - Logical SFF

Change-Id: I7377fd16f2ed6e6defecbe1e2ac97a5517b54f41
Signed-off-by: eceujmm <ursicio.javier.martin@ericsson.com>
8 years agoMerge "Fix build failure caused by following OpenFlow patch https://git.opendaylight...
Brady Johnson [Thu, 4 Aug 2016 16:59:55 +0000 (16:59 +0000)]
Merge "Fix build failure caused by following OpenFlow patch https://git.opendaylight.org/gerrit/#/c/42630/"

8 years agoFix build failure caused by following OpenFlow patch 82/43082/1
Anil Vishnoi [Wed, 3 Aug 2016 19:43:07 +0000 (12:43 -0700)]
Fix build failure caused by following OpenFlow patch
https://git.opendaylight.org/gerrit/#/c/42630/

Change-Id: I0e4877a04040714765a23f733d4a725764a24948
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoAdd VPP Renderer 99/42699/4
Yi Yang [Thu, 28 Jul 2016 11:30:19 +0000 (19:30 +0800)]
Add VPP Renderer

VPP is a high performance data plane, https://wiki.fd.io/view/VPP/What_is_VPP%3F
has detailed introduction. It can replace ovs and act as a virtual switch.

Another project honeycomb (https://wiki.fd.io/view/Honeycomb) provides REST and
NETCONF APIs for VPP in order that ODL controller can control VPP very easily.

VPP Renderer will render SFC RSP to corresponding objects in VPP, this can enable
VPP to act as a SFF, VPP Renderer also can handle the use case VPP acts as SF NSH
proxy.

Change-Id: Ia5c0e196797674e878fae5642daaaab4dc1f6d25
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
8 years agoMerge "Introduce SFC Proof of Transit via in-band OAM"
Reinaldo Penno [Tue, 2 Aug 2016 13:50:18 +0000 (13:50 +0000)]
Merge "Introduce SFC Proof of Transit via in-band OAM"

8 years agoAdd new module sfc-genius 56/42256/5
Jaime Caamaño Ruiz [Fri, 15 Jul 2016 11:02:28 +0000 (13:02 +0200)]
Add new module sfc-genius

This commit adds the skeleton of new module sfc-genius.
Sfc will start using odl genius project as a generic
network service provider and this module will contain
several specific items related to this handling.

Among other things, it will contain:
* Listeners for SFC configuration events that require
  any Genius related action.
* Listeners for Genius operational events that require
  any SFC related action.
* Genius related utilities

Change-Id: Ia26269d7765f17a5836c3054eef9e6912e9ebc0c
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
8 years agoDo not pull JUnitParams into runtime 14/42814/1
Robert Varga [Sat, 30 Jul 2016 00:24:04 +0000 (02:24 +0200)]
Do not pull JUnitParams into runtime

This is used only for testing, hence the dependency
should be scope to test.

Change-Id: Iecc7ed0961c69759437424fb3065bf2ab7c3b328
Signed-off-by: Robert Varga <rovarga@cisco.com>
8 years agoBUG 6268: service-function-dictionary grouping is redundant as it is 48/42248/3
danipeon [Thu, 21 Jul 2016 07:45:17 +0000 (09:45 +0200)]
BUG 6268: service-function-dictionary grouping is redundant as it is

The grouping service-function-dictionary is already defined in the SFF
configuration with the same name. It was not desired to repeat the name
nor reuse the same fields, so additionally to change the name,
the following fields should be removed:

     list sff-interfaces
     leaf failmode

Additionally in this grouping, the grouping dpn-locator is used and
it should be renamed to dpn-grouping since the dpn-id defined inside
is not going to be defined as other locators.

Change-Id: Ib2042251ad6850da007979ad9dc861b4465b4a7d
Signed-off-by: danipeon <daniel.peon.quiros@ericsson.com>
8 years agoMerge "Add configuration examples for SFC"
Brady Johnson [Fri, 29 Jul 2016 12:34:21 +0000 (12:34 +0000)]
Merge "Add configuration examples for SFC"

8 years agoBUG 6267: yang:uuid type for interface-uuid should be string type 47/42247/4
danipeon [Wed, 20 Jul 2016 14:50:54 +0000 (16:50 +0200)]
BUG 6267: yang:uuid type for interface-uuid should be string type

-Renamed interface-uuid to interface-name.
-Modified type of interface-uuid to string type.
-Renamed openstack-vm to logical-interface.

Change-Id: If1b0ace0231fc421465395ee241277ea04c6544b

More changes

Change-Id: I7cbaf7a8d527c37cc008435c5b11352c28f904cb
Signed-off-by: danipeon <daniel.peon.quiros@ericsson.com>
8 years agoBUG 6266: Correct augmentation for service-function-forwarders-state 53/42553/3
danipeon [Wed, 20 Jul 2016 14:28:44 +0000 (16:28 +0200)]
BUG 6266: Correct augmentation for service-function-forwarders-state

The augmentation overwrites the generated class:
sff-logical-sff-augmentation.

Change-Id: Id40961d82f41245e5377828660dd555927121847
Signed-off-by: danipeon <daniel.peon.quiros@ericsson.com>
8 years agoAdd configuration examples for SFC 15/42715/2
David Suarez [Thu, 28 Jul 2016 15:00:03 +0000 (17:00 +0200)]
Add configuration examples for SFC

Add configuration examples for SFC. These examples will be useful
to test from simple scenarios for happy testing to more complex ones,
as the one used in SFC103 demo. The configuration examples include
both JSON files as well as Postman collections.

Change-Id: Icaaf4fc3ca17988821356cfceeb36976c3296aa0
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
8 years agoImproved debugability of SFC flows 29/42329/2
Brady Johnson [Fri, 22 Jul 2016 17:02:42 +0000 (19:02 +0200)]
Improved debugability of SFC flows

- Based on OPNFV SFC testing, I wanted to be able to easily
  find the code where the complicated transport egress flows
  are created, so I made individual cookie values for each
  of the flows.
- I also removed a pass-through method that wasnt needed to
  further simplify the code.
- Added Cookies for NSH_ETH, VLAN, and MPLS transport egress

Change-Id: Ic1a5783371b379c4870efffbe47ae099ab8753d9
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
8 years agoupdate sfc103 demo default installation from scratch build to ODL integration 48/42448/1
Guo Ruijing [Mon, 25 Jul 2016 08:36:17 +0000 (16:36 +0800)]
update sfc103 demo default installation from scratch build to ODL integration

Change-Id: Iea5c3efa9781e99d5e207bac7cbdbf4f53b7c939
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoIntroduce SFC Proof of Transit via in-band OAM 69/40669/9
Srihari [Wed, 22 Jun 2016 09:51:47 +0000 (15:21 +0530)]
Introduce SFC Proof of Transit via in-band OAM

Initial commit

Change-Id: I958934744ba332d0f9078325f828afae549a9187
Signed-off-by: Srihari <srihari@cisco.com>
8 years agoDynamic insert & remove SF 85/41185/9
Guo Ruijing [Fri, 15 Jul 2016 03:43:59 +0000 (11:43 +0800)]
Dynamic insert & remove SF

1. refactor sfc103 demo
2. add dynmic insert & remove sf demo

Change-Id: I9b281c1afb989d8f5dc8fc96993027faa0bfd8ce
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoMerge "Remove wildcard imports"
Brady Johnson [Tue, 19 Jul 2016 14:40:53 +0000 (14:40 +0000)]
Merge "Remove wildcard imports"

8 years agoRemove wildcard imports 80/41980/1
David Suarez [Mon, 18 Jul 2016 14:12:28 +0000 (16:12 +0200)]
Remove wildcard imports

Remove wildcard imports to comply with Open Daylight's coding
guidelines.

Change-Id: I77fb46b18f4817280cbd1189ee587ed756156df0
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
8 years agoios-xe renderer - encapsulation removed from SF 11/41611/2
Vladimir Lavor [Sat, 9 Jul 2016 16:10:01 +0000 (18:10 +0200)]
ios-xe renderer - encapsulation removed from SF

Change-Id: Ie82c7495311885da5dda66416271f22d3191215c
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoMerge "Only the OVS Bridge name is needed on the SFF."
Keith Burns [Sun, 17 Jul 2016 03:51:51 +0000 (03:51 +0000)]
Merge "Only the OVS Bridge name is needed on the SFF."

8 years agoMake ui-module a provided dependency 61/41761/3
Brady Johnson [Wed, 13 Jul 2016 12:47:08 +0000 (14:47 +0200)]
Make ui-module a provided dependency

Since ui-bundle already includes all of ui-module,
we should make it a provided dependency so it does
not get packaged into the distribution.

Based on a recomendation by Robert Varga and
Alexis Talhouet, and this patch:
https://git.opendaylight.org/gerrit/#/c/41720

Change-Id: I8fd90528a91c8a8812a6f5a93bc9a389b1ebc194
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
8 years agoOnly the OVS Bridge name is needed on the SFF. 55/38055/4
Martin Sunal [Mon, 15 Feb 2016 17:55:31 +0000 (18:55 +0100)]
Only the OVS Bridge name is needed on the SFF.

Previously the OVS Node was specified, but only the bridge name is needed.

Change-Id: Id5ecc2cb91091c306add8a98efcb59c9fca3e4e7
Signed-off-by: Martin Sunal <msunal@cisco.com>
(cherry picked from commit 3a40b7d71a64f5911ad9356273a3627eb6627bad)

8 years agoUpdate of the vxlan-tool 38/41638/5
Manuel Buil [Mon, 11 Jul 2016 09:01:23 +0000 (11:01 +0200)]
Update of the vxlan-tool

We add features:

- Act as a firewall blocking specific TCP ports
To do so, use the flag -b when starting the tool.
For example, to block TCP port 22:

python vxlan_tool.py -i eth0 -d forward -b 22

- Decapsulate the NSH
Using the flag -f, it is possible to decapsulate packets
which come with NSH. For example:

python vxlan_tool.py -i eth3 -d forward -f

Change-Id: Ia7b6a392fca1c2ab0587dfd590a7f9726d2f20b0
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
8 years agoFix build due to openflowplugin and ovsdb model upgrade 68/41368/6
Lorand Jakab [Wed, 13 Jul 2016 02:22:40 +0000 (21:22 -0500)]
Fix build due to openflowplugin and ovsdb model upgrade

This is needed after https://git.opendaylight.org/gerrit/40798 and
https://git.opendaylight.org/gerrit/40820 are merged.

Change-Id: I13b5625ccd860804d84e6cfc845d643edd774b01
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
8 years agoMerge "Enable honeycomb backed SFFs."
Reinaldo Penno [Mon, 11 Jul 2016 16:28:55 +0000 (16:28 +0000)]
Merge "Enable honeycomb backed SFFs."

8 years agoBUG 5028 - Test GBP and SFC against Li OFP 06/33106/7
Matej Perina [Thu, 14 Apr 2016 12:10:01 +0000 (14:10 +0200)]
BUG 5028 - Test GBP and SFC against Li OFP

migration to openflowplugin Li

Change-Id: I42e3fce86b6a6eb34189ec55f6ea184c14720c95
Signed-off-by: Matej Perina <matej.perina@pantheon.sk>
8 years agoEnable honeycomb backed SFFs. 50/41450/2
Ed Warnicke [Wed, 6 Jul 2016 21:22:40 +0000 (16:22 -0500)]
Enable honeycomb backed SFFs.

Change-Id: I91382663afbd81b379771eca570bbba2087300f5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
8 years agoYang definitions for the Logical SFF 47/40947/6
Diego Granados [Tue, 28 Jun 2016 14:46:25 +0000 (16:46 +0200)]
Yang definitions for the Logical SFF

  This yang model adds yang definitions for the logical SFF.
  The feature aims for a simpler configuration of SFC, which
  does not need to be reconfigured when working on scenarios where
  the SF are provided by virtual machines which can be executed /
  moved on different compute nodes

Change-Id: I9cfd7e794c0f812d5f246e59059720492a547812
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
8 years agoAddition of the sfc encapsulation type 06/41206/4
Diego Granados [Fri, 1 Jul 2016 11:24:42 +0000 (13:24 +0200)]
Addition of the sfc encapsulation type

Addition of the sfc encapsulation type
in the service function path and rendered
service path

Change-Id: I002f8ac35305831f88da04ab7beb7f1c989d51d4
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
8 years agoSort java import 27/40527/5
Guo Ruijing [Wed, 29 Jun 2016 21:25:20 +0000 (05:25 +0800)]
Sort java import

run the following command to sort

FILES=`find . -type f | grep "/src/.*java$"`

for FILE in $FILES
do
    echo "replace $FILE"

    sed -n -e '1,/^import .*;$/p' $FILE | grep -v '^import .*;$' > $FILE.part1
    sed -n -e '/^import .*;$/p' $FILE > $FILE.part2
    sort -u $FILE.part2 > $FILE.part2.s
    sed -n  '/^import .*;$/,/^END/p' $FILE | grep -v '^import .*;$' > $FILE.part3
    sed -i -e '2,/^$/N;/^\n$/d' $FILE.part3
    cat $FILE.part1 $FILE.part2.s $FILE.part3 > $FILE
    rm -rf $FILE.part1 $FILE.part2 $FILE.part2.s $FILE.part3
done

Change-Id: I3d94e479f60549b9b09c380eaa43dadc8b9ed256
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoUpgrade sfclisp to latest ietf-inet-types 18/41218/2
Lorand Jakab [Fri, 1 Jul 2016 15:58:30 +0000 (10:58 -0500)]
Upgrade sfclisp to latest ietf-inet-types

Change-Id: I73587a3d76c2ed32216c00aeb6f10de516e9ffa4
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
8 years agoBreak sfc-openflow-renderer's cyclic package dependencies 15/40315/2
Jose-Santos Pulido Garcia [Tue, 14 Jun 2016 10:33:27 +0000 (12:33 +0200)]
Break sfc-openflow-renderer's cyclic package dependencies

This change is an strict refactoring and it does not modify
functionality.

In order to break the cyclic dependecies the following moves have been
performed:

- Classes SfcOfProviderUtils, SfcOfBaseProviderUtils, and
SfcSynchronizer have been moved to new package ofrenderer/utils.

- Listeners have been moved to new package ofrenderer/listeners.

- Processors have been moved to new package ofrendere/processors.

- Tests have been updated accordingly.

Now the dependecy graph (roughly) is:

- ofrenderer package uses almost everything but only the yang module
uses it.

- listeners package uses openflow, processors, sfg, and utils.

- processors package uses openflow, sfg, and utils.

- openflow package uses only sfg.

- utils and sfg packages use nothing.

Change-Id: Ia59e12a45694978fc75f5a78b38065fa23c68353
Signed-off-by: Jose-Santos Pulido Garcia <jose.santos.pulido.garcia@ericsson.com>
8 years agoUpdating/Fixing Yang models 09/40209/9
Guo Ruijing [Wed, 29 Jun 2016 01:55:16 +0000 (09:55 +0800)]
Updating/Fixing Yang models

- Fixing models so that they pass --ietf
- Updating inet-types and common-yang accordingly
- Fixing all associated code accordingly
- Adding proper change to AbstractDataStoreManager.java for
  ServiceFunctionTypes
- Took care of Ruijing comments
- Took care of Martin comment
- Merged all code
- Add IETF ACL Draft 7

Change-Id: I180494555042034b687044e55bbda816bc6865ec
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
8 years agoFix unit tests in sfc-provider - SfcServicePathId 19/40919/4
Vladimir Lavor [Tue, 28 Jun 2016 09:36:34 +0000 (11:36 +0200)]
Fix unit tests in sfc-provider - SfcServicePathId

Change-Id: Ibd5cd91a2d0e03282ce7a3c9ba2171b2f425ac11
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoService functions are read from datastore. not from netconf device 25/40625/3
Vladimir Lavor [Tue, 21 Jun 2016 14:53:59 +0000 (16:53 +0200)]
Service functions are read from datastore. not from netconf device

Change-Id: I85e9a326b3860676ae63365a2a09de0039e23eb7
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoRetry transaction when accessing temporary locked netconf device 03/40603/3
Vladimir Lavor [Tue, 21 Jun 2016 10:48:07 +0000 (12:48 +0200)]
Retry transaction when accessing temporary locked netconf device

Change-Id: I56b02e769974c6f32c2c67a150390bc2ed5f2029
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoCreate reversed rsp name in separate method 35/40535/3
Vladimir Lavor [Mon, 20 Jun 2016 07:08:44 +0000 (09:08 +0200)]
Create reversed rsp name in separate method

Change-Id: I1570d10a0761d030a800dda719208a985d6e4aff
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agosfc ios-xe renderer is now using the same ned.yang file as gbp 30/40530/5
Vladimir Lavor [Mon, 20 Jun 2016 06:38:30 +0000 (08:38 +0200)]
sfc ios-xe renderer is now using the same ned.yang file as gbp

Change-Id: Icda2e90aa729665e307ee59e1bdbac251f6e64d3
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoFix sfc-provider unit test which could occasionaly fail 56/40656/1
Vladimir Lavor [Wed, 22 Jun 2016 07:53:02 +0000 (09:53 +0200)]
Fix sfc-provider unit test which could occasionaly fail

Change-Id: Ic2b248527fd46760c99e932b8cae284a19b147d0
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoMerge "Fix for bug 6072: race condition in test SfcIpv4PacketInHandlerTest.pktInPurge...
Reinaldo Penno [Tue, 21 Jun 2016 19:52:00 +0000 (19:52 +0000)]
Merge "Fix for bug 6072: race condition in test SfcIpv4PacketInHandlerTest.pktInPurgeBuffering"

8 years agoAdded rsp processing state notifications to ios-xe-renderer 49/40449/1
Vladimir Lavor [Thu, 16 Jun 2016 15:33:23 +0000 (17:33 +0200)]
Added rsp processing state notifications to ios-xe-renderer

Change-Id: I7e97b6381b2063370447af6d39af9544b70d9095
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
8 years agoNetconf capability check in ios-xe-renderer for sfc 34/40234/5
Vladimir Lavor [Mon, 13 Jun 2016 12:17:40 +0000 (14:17 +0200)]
Netconf capability check in ios-xe-renderer for sfc

Change-Id: I6a57f49eac36cd557bd996e2a789d8e8a1f39f14
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
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 <diego.jesus.granados.lopez@ericsson.com>
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 <brady.allen.johnson@ericsson.com>

Change-Id: I49ba138bcb13cd43566968ece6e318bb0417d542
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
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 <suvitha.balu@tcs.com>
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 <jose.santos.pulido.garcia@ericsson.com>
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) <alagalah@gmail.com>
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 <ruijing.guo@intel.com>
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 <vlavor@cisco.com>
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 <jose.santos.pulido.garcia@ericsson.com>
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 <jose.santos.pulido.garcia@ericsson.com>
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 <jesus.javier.arauz@ericsson.com>
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 <vlavor@cisco.com>
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 <jose.santos.pulido.garcia@ericsson.com>
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 <lojakab@cisco.com>
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 <tpanteli@brocade.com>
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 <skitt@redhat.com>
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 <miguel.angel.munoz.gonzalez@ericsson.com>
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 <thanh.ha@linuxfoundation.org>
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 <skitt@redhat.com>
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 <skitt@redhat.com>
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 <ruijing.guo@intel.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
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 <rapenno@gmail.com>
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 <matej.perina@pantheon.sk>
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 <brady.allen.johnson@ericsson.com>
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 <brady.allen.johnson@ericsson.com>
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 <ruijing.guo@intel.com>
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 <thanh.ha@linuxfoundation.org>
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 <mcmarada@cisco.com>
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 <brady.allen.johnson@ericsson.com>
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 <thanh.ha@linuxfoundation.org>
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 <shague@redhat.com>
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 <mcmarada@cisco.com>
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) <alagalah@gmail.com>
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
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 <brady.allen.johnson@ericsson.com>
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 <yi.y.yang@intel.com>
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 <brady.allen.johnson@ericsson.com>
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
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 <fcoras@cisco.com>
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 <tcechval@cisco.com>
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) <alagalah@gmail.com>
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) <alagalah@gmail.com>
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 <rapenno@gmail.com>
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 <ruijing.guo@intel.com>