eceujmm [Mon, 17 Oct 2016 11:55:54 +0000 (13:55 +0200)]
SFC openflow renderer: remove RuntimeException as a communication mechanism
Conflicts:
sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorLogicalSff.java
Change-Id: Ib79a96e5341326c5a0beb94946e5c7d0eca0fa65
Signed-off-by: eceujmm <ursicio.javier.martin@ericsson.com>
Diego Granados [Thu, 6 Oct 2016 16:02:59 +0000 (18:02 +0200)]
Corrections in mac handling for logical sff
Included changes:
- nextHop: inner dst mac address was being changed instead of
the one in the eth encapsulation header (fixed). Also, added
the src mac address, so the packet can be correctly forwarded
(by switching src and dst mac) after SF processing
- changed src mac address at chain egress so the packet won't
be dropped because of bad src mac at subsequent pipeline
stages
- Table 0 (classifier) table is no longer written by Logical
transport processor in any circumstance (logical SFF is
always used in cooperation with Genius -> Genius owns
table 0 always (it is used for service binding)
- Some test improvements
Change-Id: I1f344604801f0855cc35ea27885de91427766f24
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
David Suarez [Mon, 17 Oct 2016 23:07:31 +0000 (01:07 +0200)]
Change deprecated DataChangeListener.
Change deprecated DataChangeListener by the new DataTreeChangeListener.
Change-Id: I81f84548f97930da80ebb72ef07d9c6599220189
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Diego Granados [Fri, 21 Oct 2016 11:13:24 +0000 (13:13 +0200)]
fix for netconf model change
- fixes changes made in https://git.opendaylight.org/gerrit/#/c/43972/,
which was breaking SFC build
Change-Id: Ib29dfed9f6f80493b4ef0d8ff5ab5677e45666ca
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
Jaime Caamaño Ruiz [Wed, 21 Sep 2016 15:04:56 +0000 (17:04 +0200)]
Bind SFC service to interface in sfc-genius
Performs bind of SFC service for the logical interfaces handled through
Genius. Includes adding the SFC terminating service action to the
interface node, which handles SFC traffic incoming through tunnel, if
it is the first interface bound to SFC service on the node.
Some comments about the solution implemented through this patch:
- For Boron it is expected to have a independent vxlan-gpe tunnel mesh
that uses a VNID of 0 for all SFC traffic.
- Using a rather uninspired flow priority and cookie for the rule that is
added on the genius dispatcher table through the binding. Feedback
welcome.
Change-Id: Iee00923a1e18e61902dc2c2218f7a4e84717da27
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Miguel Angel Munoz Gonzalez [Mon, 17 Oct 2016 08:26:39 +0000 (10:26 +0200)]
Bump SFC versions and remove incorrent parent versions
sfc-ui/module/pom.xml included a hardcoded version reference
from the dlux project. Now it is dependent on sfc-ui and
sfc-ui depends on sfc parent pom.
Change-Id: I5da41297b8ef7836b03856e32ebdeb5d223412db
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>
David Suarez [Tue, 11 Oct 2016 07:45:05 +0000 (09:45 +0200)]
Change deprecated DataChangeListener by the new DataTreeChangeListener.
It adds two abstract listeners to simplify the process of creating new
listeners.
Change-Id: Ia00fded0029fa34e9b9bf85c2d779094d8ebff6f
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Miguel Angel Munoz Gonzalez [Fri, 14 Oct 2016 08:34:58 +0000 (10:34 +0200)]
Hardcode sfc-ui version to avoid compilation warning
sfc-ui module version is set to fixed valud 0.5.0-SNAPSHOT
temporarily to fix the blocker issue caused by
https://git.opendaylight.org/gerrit/#/c/46730/
Further discussions are being held to remove the version tag
from this module and inherit from parent project, maybe
requiring bumping the versions.
Change-Id: I62d19f6a3c48af2d3be48accf1f27867d57bf874
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>
Miguel Duarte [Fri, 14 Oct 2016 12:50:40 +0000 (14:50 +0200)]
Fix NPE when clearing SFF initialization flows
NPE whenever initialization flows did not exist (for instance, no RSP
ever created). Fixed by checking their existence before filtering
the ones that belong to orphan SFFs.
Change-Id: Id5601c630395551d031658de8e74f847904c6124
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
Miguel Duarte [Tue, 11 Oct 2016 08:59:22 +0000 (10:59 +0200)]
Remove technical debt from the project.
Added a couple of tests to SfcOfRspTransactionalProcessorTest, thus
checking that attempting to delete a nonexistent RSP does not crash the
process.
Hid the constructors of some classes that only contain static methods.
Refactored the OpenFlowProgrammer, thus removing plenty of duplicated
code.
Logged the exceptions on the SfcOfFlowWriterImpl, thus removing sonar
warnings.
Change-Id: I8771897ec5026f255c8def7e7627275eb5ec90c8
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
Miguel Angel Munoz Gonzalez [Mon, 10 Oct 2016 14:09:46 +0000 (16:09 +0200)]
Remove Maven warnings for using variable in version
This commit fixes the warning for using a variable in the
version tag of the artifact.
The artifact should get the version from the parent pom.
Note that variables in version tag should not be allowed.
Change-Id: I2cafc4609e27c74ea0874b4a0c3bbf4fc1707cdd
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>
Miguel Duarte [Fri, 30 Sep 2016 09:16:14 +0000 (11:16 +0200)]
Logical SFF component test
Features a component test of the RspProcessor used when the SFC uses a
logical SFF. The test features and end to end scenario of 2 SFs,
connected through a logical SFF entity. The genius RPC, and the genius
data utils are mocked.
The test provided 'simulates' a single compute node being used, since
the mocked genius RPC is returning the same dataplane ID, independently
of the logical interface being queried.
Notes:
- Added a couple of methods to the SfcGeniusDataUtils class, thus
entirely replacing the API of SfcLogicalInterfaceOfUtils.
- Removed SfcLogicalInterfaceOfUtils, since SfcGeniusDataUtils provides
the same functionality, but using better abstractions, and has been
extensively unit tested.
- Replaced the calls to this API throughout the code, namely, in the
processor classes.
- Changes add to be made to the RspBuilder class, enabling logical SFFs to
be used in unit/component tests.
- An empty constructor had to be added to the OpenFlowProgrammer class, so
that it could be mocked / spied in unit tests.
Change-Id: I32de81363ad69d6a8ca0cb32aaa061887ebbf76f
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
Diego Granados [Tue, 4 Oct 2016 12:46:53 +0000 (14:46 +0200)]
Add Genius-based app coexistence (table index mapping)
Added logic for performing translation between a set of external SFC
table indexes and the table indexes which are reserved by Genius for those tables.
For doing so, the client module (sfc renderers using Genius) first builds a
SfcTableIndexMapper (using the convenience SfcTableIndexMapperBuilder
class) by providing the table indexes it uses for each SFC table (this
mechanism exists in order not to have a circular dependency between
sfc-genius and the sfc renderer). Later, at flow writing time, the flow
programmer will use the mapping class in order to retrieve the correct
table indexes for each SFC table
In short, this logic allows to perform Genius-based application coexistence
at table level, while keeping the previous application coexistence when
genius is not used
Change-Id: I536ce79fde7d1960db9d3192a11ba9088e367806
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
Guo Ruijing [Sun, 9 Oct 2016 20:39:04 +0000 (16:39 -0400)]
Update ODL integration maven repo
Change-Id: Ib640308b72bc5d90d9a24a59c1d3dd3fc060cc85
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
David Suarez [Fri, 7 Oct 2016 13:44:24 +0000 (15:44 +0200)]
Move sfc-provider listeners to their own package following the typical
structure
in other bundles.
Change-Id: I0f30502ff96d9bb94a6b0eac809e3f8b2f1ce084
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Rashmi Pujar [Fri, 9 Sep 2016 21:21:58 +0000 (17:21 -0400)]
Add BP wiring for sfc-pot
Change-Id: I3cac8051a891fd2a7fe229c8eaeaaebc992f1573
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 9 Sep 2016 21:02:06 +0000 (17:02 -0400)]
Add BP wiring for sfc-sb-rest
Change-Id: I5d55db2e18842e7f915b383a2c9976fca76e980e
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 9 Sep 2016 20:11:18 +0000 (16:11 -0400)]
Add BP wiring for sfc-lisp
Change-Id: I822a4d22113ea97cc6766af6f69816d2cb24fde8
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 9 Sep 2016 19:13:39 +0000 (15:13 -0400)]
Add BP wiring for sfc-vpp-renderer
Change-Id: I5cd39e31c4cadabe9eaf5b253b31ee97296df2a1
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 9 Sep 2016 18:36:03 +0000 (14:36 -0400)]
Add BP wiring for sfc-scf-openflow
Change-Id: I48692a63f6ffe3d10c4442b9d1cc11c7adc58a4b
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 9 Sep 2016 17:39:28 +0000 (13:39 -0400)]
Add blueprint wiring for sfc-ovs bundle
Change-Id: Ib5feb7fdfacc7528ff43bfdab2b45eb16cdce3cb
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Miguel Duarte [Fri, 23 Sep 2016 13:50:52 +0000 (15:50 +0200)]
Utilities for Genius related datastore operations
- Utils for genius data retrieval, namely the MAC address of the service
function, connected through a neutron port, and the name of the
logical interface to which a service function is connected to. This
data is required for the Logical SFF feature.
- Unit Tests of the supplied classes
Change-Id: I7acd13504b489330854a6a79da07c5f0433c06da
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
David Suarez [Wed, 5 Oct 2016 16:38:45 +0000 (18:38 +0200)]
Minor formatting and checkstyle changes to improve readability.
Change-Id: I4a9832c419d00c7ad50b4000b15534e0759b3b71
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Diego Granados [Thu, 28 Jul 2016 12:23:05 +0000 (14:23 +0200)]
New transport processor for Logical SFF
Created a new RSP processor class for chains which use Logical SFFs.
On such chains, SFF configuration is trivial (it only defines SFF name),
while SFs attached to the logical SFF define use Logical Interfaces as DPL.
That logical interfaces are used to gather all required information for
path rendering via Genius project
Transport protocols are the same than in the NshEth processor (that is,
Eth+NSH between the SFF and SF, and VXGPE+NSH between the SFFs)
Change-Id: Ic8175c02006f7b6c08120941b7e535d551c3f56a
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
Jaime Caamaño Ruiz [Fri, 30 Sep 2016 14:36:16 +0000 (16:36 +0200)]
Unbind SFC service from interface on sfc-genius.
Performs unbind of SFC service for the logical interfaces handled
through Genius. Includes removing the SFC terminating service action
from the interface node, which handles SFC traffic incoming through
tunnel, if there are no more interfaces bound to SFC service on the
node.
A handler is setup for this task, SfcGeniusServiceHandler, which
coordinates the task through more sub-handlers specialized in read and
write operations through asynchronous APIs. JDK8 new CompletableFuture
is leveraged to asynchronously chain read & write asynchronous
operations.
For the time being, the module stores in-memory the data plane node
location of each interface (dpnInterfaces map), which is an information
needed to handle the terminating service actions. On a later patch, this
will be stored in the SFC operational data store.
The implementation is asynchronous for the following reasons:
- Javadoc of APIs recommend using the asynchronous interfaces over
the synchronous ones.
- With the introduction of JDK8, more code facilities are available to
produce asynchronous readable code.
- Being sfc-genius an independent small module, it's deemed a good
chance to get a taste for it.
Change-Id: I145b4eb0aa6a4f17ff0c3bd8344a0486d8d7be96
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Miguel Duarte [Mon, 3 Oct 2016 09:38:21 +0000 (11:38 +0200)]
Fix a possible null pointer on RSP deletion
- remove wildcard imports from SfcOfRspTransactionalProcessorTest
- fix a null pointer exception that accured whenever an RSP was
deleted and for some reason it did not get properly added to the
datastore
Change-Id: I50888a9fbacf0fcf53f4aae4af2344758efb0bc8
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
Brady Johnson [Wed, 21 Sep 2016 13:33:18 +0000 (13:33 +0000)]
Merge "Handle data change events on sfc-genius listeners"
Brady Johnson [Wed, 21 Sep 2016 13:31:38 +0000 (13:31 +0000)]
Merge "Bug 6657: Added init-method into ios-xe-renderer blueprint xml"
Jaime Caamaño Ruiz [Thu, 15 Sep 2016 16:24:55 +0000 (18:24 +0200)]
Handle data change events on sfc-genius listeners
sfc-genius needs to be aware of the following data change events:
- IETF Interface State
When service function migrate from one location to another,
the state of the associated logical interface is removed
and then added again. Attribute LowerLayerIf reflects it's
new location. On such a case, sfc-genius needs to trigger
re-renderization of the affected RSPs.
- SFC Service Function State
When a service function becomes involved with one or more RSP,
sfc-genius needs to undertake the appropiate actions towards
Genius to bind the SFC service to the associated logical interfaces.
Initially, data store change events are handled on a statically shared
thread provided by AsyncDataTreeChangeListenerBase. Being this is a
Genius utility class shared also with genius and netvirt, jobs are
taken off to a different single thread executor where there are
enqueued and processed synchronously in order.
Another single thread executor will be used as continuation through the
callbacks of the different asynchronous APIs (Data store reads,
transactions, Rpcs) that are to be used later on.
Change-Id: Ib50c9e63a58b06eafb29fb539d0b4e0d760f7aa5
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Vladimir Lavor [Mon, 19 Sep 2016 08:46:14 +0000 (10:46 +0200)]
Bug 6657: Added init-method into ios-xe-renderer blueprint xml
Change-Id: I1c1c92592d3654c598740aad46723afcd95b711d
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
Sergio Arroutbi Braojos [Mon, 12 Sep 2016 14:16:04 +0000 (14:16 +0000)]
Avoid run_demo.sh retries calculation error
Change-Id: Ia36b03e633ae9375531d7c349d63d1aa45a228b0
Signed-off-by: Sergio Arroutbi Braojos <sergio.arroutbi.braojos@ericsson.com>
Miguel Duarte [Mon, 12 Sep 2016 16:31:23 +0000 (18:31 +0200)]
Bug 5969 - Flows left behind in the OVSs
- Modified the initialization flows cleaning behavior, this time
accounting individually for each SFF: whenever an SFF does not
feature in any RSP, its flows are deleted
- Added unit testing of this particular behavior
- Tiny changes in the InstanceIdentificar instantiation in
SfcOfFlowProgrammerImpl.java
Change-Id: I2382a65adb5c6d19a477ee2643941d00cfdf5bee
Signed-off-by: Miguel Duarte <miguel.duarte.de.mora.barroso@ericsson.com>
Guo Ruijing [Mon, 12 Sep 2016 06:26:31 +0000 (02:26 -0400)]
Increase time after docker build
Change-Id: I88cd7e5c9f207166a603dee89a4c1c2aebe55d99
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Vladimir Lavor [Mon, 5 Sep 2016 14:52:46 +0000 (16:52 +0200)]
Removed non-existing required capability from sfc-ovs initial configuration
Required yang model does not exist, not possible to install
sfc-openflow-renderer feature. File sfc-provider-impl.yang
was removed here https://git.opendaylight.org/gerrit/#/c/42661/18
Change-Id: I82a90aafba4615b01f568f67910d92d8d69327b4
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
Jaime Caamaño Ruiz [Tue, 6 Sep 2016 15:26:03 +0000 (17:26 +0200)]
Bug 6649 - Fix sfc-encapsulation placement
Added sfc-encapsulation at root level of service-function-path
in the yang model. It was previously wrongly placed on the
service function path hops.
Added logic to handle a default value: 'nsh' for vxlan-gpe
transport type, and 'transport' in every other case.
Included updated sample jsons.
Change-Id: Idfc205cbf8e636feed89ba7d2aa07f7078848123
Signed-off-by: Jaime Caamaño Ruiz <jaime.caamano.ruiz@ericsson.com>
Guo Ruijing [Mon, 8 Aug 2016 00:45:53 +0000 (20:45 -0400)]
Update sfc103 to docker based version
- Additionally the demo can be executed several times without vagrant vm destruction
- Compliant with OVS 2.5.90 NSH patches written by Yi Yang
Change-Id: I13b5561c263b5fc76511adff42010bf51696f572
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Signed-off-by: Ricardo Diaz Campos <ricardo.diaz.campos@ericsson.com>
Ricardo Diaz Campos [Wed, 7 Sep 2016 08:10:04 +0000 (10:10 +0200)]
Reorder imports and disable flake8 quality assurance checkings for them in sfc_agent
- The sfc_agent is not working because of the order of some imports. This change requires
disable fleak8 quality assurance checkings. The complete module should be refactored
to avoid the checkings cancellation (noqa flag).
Change-Id: I23b78cf85462453a805d28324691f271806f572f
Signed-off-by: Ricardo Diaz Campos <ricardo.diaz.campos@ericsson.com>
Yi Yang [Fri, 8 Jul 2016 03:33:46 +0000 (11:33 +0800)]
Support VxLAN-gpe in sfc103 demo setup
Make sure it can work with https://github.com/yyang13/ovs_nsh_patches
Change-Id: Iea4f5222620474d127d942751d777f46e34eb57c
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Yi Yang [Fri, 8 Jul 2016 03:22:56 +0000 (11:22 +0800)]
Enable sfc-py to support VxLAN-gpe + Eth + NSH use case
Change-Id: I0970b987f60216240e8e932f2df06f0c941d4257
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Yi Yang [Wed, 7 Sep 2016 06:13:04 +0000 (14:13 +0800)]
Bug 6640 - SFC VPP Renderer can't work with Honeycomb and VPP
- Updated v3po.yang and vpp-nsh.yang
- Added BridgeDomain "SFCVPP"
- Finished integration test with Honeycomb and VPP
- Fixed several integration issues
Change-Id: Ie695f4398446e8dee43b1dc406385e3c1e1a47de
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Miguel Angel Munoz Gonzalez [Tue, 6 Sep 2016 14:33:17 +0000 (16:33 +0200)]
Bug 6648 Fix: Not possible to add additional Service Function's data plane locators
This commit fixes exception given (500 http error code) returned
when a second data plane locator is added to an existing service function
This bug is filed as 6648: https://bugs.opendaylight.org/show_bug.cgi?id=6648
Change-Id: I20463bc3a05e509528417de738f17a8df3e49b07
Signed-off-by: Miguel Angel Munoz Gonzalez <miguel.angel.munoz.gonzalez@ericsson.com>
Guo Ruijing [Sun, 4 Sep 2016 16:27:13 +0000 (12:27 -0400)]
Remove unused code & fix pep8 issues
Change-Id: I4fb3807ba6edb59d42bc81cc49e818ff8610fdbe
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
esergbr [Wed, 31 Aug 2016 15:31:58 +0000 (15:31 +0000)]
Add blueprint wiring for sfc-openflow-renderer
Change-Id: Ibde7b70e52aaa26413e662a6c77d2a5079c112f9
Signed-off-by: esergbr <sergio.arroutbi.braojos@ericsson.com>
Rashmi Pujar [Fri, 19 Aug 2016 18:48:19 +0000 (14:48 -0400)]
Add blueprint wiring for sfc-ios-xe-renderer
Change-Id: I5e907324257cecfe4b7cc76bc62e88e3420919f4
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Fri, 19 Aug 2016 14:45:16 +0000 (10:45 -0400)]
Add blueprint wiring for sfc-netconf
Change-Id: I88826203e126553fa8a65febca84c08605257cb1
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Rashmi Pujar [Wed, 27 Jul 2016 21:09:33 +0000 (17:09 -0400)]
Add blueprint wiring for sfc-provider
Change-Id: Ib4992cb0dbae907d2e7b86b7df3f4f50edea81c9
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
Diego Granados [Thu, 1 Sep 2016 13:48:19 +0000 (15:48 +0200)]
BUG 6613 - avoid randomly generated test input from randomly breaking test
Avoid randomly generated test input from randomly breaking test
by generating invalid XML chars at Surefire test report
Change-Id: Iac01d2b97a877ecb40b574395fcbc0e6b39f26e7
Signed-off-by: Diego Granados <diego.jesus.granados.lopez@ericsson.com>
Vladimir Lavor [Mon, 22 Aug 2016 08:24:24 +0000 (10:24 +0200)]
V3po.yang model updated
Change according to https://git.opendaylight.org/gerrit/#/c/44300/1
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
Change-Id: I4b0d0231089bcb75a647553ee283a5ea1f50796b
Brady Johnson [Sun, 7 Aug 2016 14:35:23 +0000 (16:35 +0200)]
BUG 6355 - reduce the size of the karaf distro
- The sfc-vnfm-tacker module doesnt need the jersey containers
at runtime, so the scope was changed to test
- https://bugs.opendaylight.org/show_bug.cgi?id=6355
Change-Id: I093ab139363fec570bc5d2339903dcb624dd5c94
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
Vladimir Lavor [Fri, 19 Aug 2016 11:37:31 +0000 (13:37 +0200)]
Fixed UT in sfc openflow renderer
Change-Id: Ic6a570d84eb757c4b270ad7ca7eb5a0ae19f0c61
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
Johnson Li [Tue, 16 Aug 2016 02:50:31 +0000 (02:50 +0000)]
Merge "BUG 6398 - fix failing unit tests"
Brady Johnson [Fri, 12 Aug 2016 16:23:35 +0000 (18:23 +0200)]
BUG 6403 - outport cant be the same as inport
- the inport cant be the same as the outport. if they are,
outport must be the string INPORT, else the pkt will be
dropped according to openflow spec.
- https://bugs.opendaylight.org/show_bug.cgi?id=6403
Change-Id: If16523ddd5eae0f94806f0bbdc7e1af1f4869267
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
Brady Johnson [Fri, 12 Aug 2016 13:08:30 +0000 (15:08 +0200)]
BUG 6398 - fix failing unit tests
- they were commented out so as not to hold things up
- now they've been uncommented and fixed
- https://bugs.opendaylight.org/show_bug.cgi?id=6398
Change-Id: I8e49089ae7bed5c62e83602cec5578646c86e379
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
Yi Yang [Thu, 21 Apr 2016 03:12:33 +0000 (11:12 +0800)]
Support new actions in new ovs nsh patches
- Change sfcofl2 to support new actions
- Change sfc classifier to support push_nsh action
- Verified by sfc103 demo
- Rebasing
- Changing topic back to topic/37937, since it was changed in previous patch set
- Added output to vxgpe port to transport egress to SF flows
- Change output:vxlangpe to IN_PORT (for gbpsfcenv demo)
Change-Id: I44e583df91e5034a6eed6e49b1e90fcd81f7c455
Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Alexis de Talhouët [Mon, 8 Aug 2016 14:29:31 +0000 (10:29 -0400)]
Add classifiers topology graph for sfc-demo/sfc103h
Change-Id: I0bc098da9a6def7ecf9365de3e5030624333a43d
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Thanh Ha [Mon, 8 Aug 2016 21:50:20 +0000 (17:50 -0400)]
Bump versions by 0.1.0 for next dev cycle
Change-Id: I8ad7da6fd17c68cc38f5ee28c5d2d6256f66e4d4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Manuel Buil [Fri, 5 Aug 2016 11:28:46 +0000 (13:28 +0200)]
Bug fix in vxlan_tool.py
TCP blocking feature was not working when ETH+NSH
Change-Id: I8afb361e494cd8d3de245c971786b46fab5b89a1
Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
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>
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>
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>
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>
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/"
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>
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>
Reinaldo Penno [Tue, 2 Aug 2016 13:50:18 +0000 (13:50 +0000)]
Merge "Introduce SFC Proof of Transit via in-band OAM"
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>
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>
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>
Brady Johnson [Fri, 29 Jul 2016 12:34:21 +0000 (12:34 +0000)]
Merge "Add configuration examples for SFC"
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>
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>
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>
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>
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>
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>
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>
Brady Johnson [Tue, 19 Jul 2016 14:40:53 +0000 (14:40 +0000)]
Merge "Remove wildcard imports"
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>
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>
Keith Burns [Sun, 17 Jul 2016 03:51:51 +0000 (03:51 +0000)]
Merge "Only the OVS Bridge name is needed on the SFF."
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>
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)
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>
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>
Reinaldo Penno [Mon, 11 Jul 2016 16:28:55 +0000 (16:28 +0000)]
Merge "Enable honeycomb backed SFFs."
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Reinaldo Penno [Tue, 21 Jun 2016 19:52:00 +0000 (19:52 +0000)]
Merge "Fix for bug 6072: race condition in test SfcIpv4PacketInHandlerTest.pktInPurgeBuffering"