Now using NSH Nsc Registers

- Add NshOneHop UT
- Copy Nsc1/Nsc2 from hop-to-hop to maintain the values through the chain
- Use Nsi, Nsp, Nsc1, and Nsc2 on the last hop (last Nsi)
-- If on the last Hop
---    If Nsc1 is not set, that is Nsc1==0
----      Output to INPORT
---    Else
----      Copy/Move Nsi, Nsp, Nsc1=>Ipv4TunDst, and Nsc2=>TunId (Vnid)

Change-Id: Ibf1a071c8de4f44a00d2e90df07e8c1df9fee305
Signed-off-by: Brady Johnson <[email protected]>

SfcProviderRpc unit tests

Change-Id: Id1a30fb6098b87e610936bb84f92f7e680d740d1
Signed-off-by: Igor Bartak <[email protected]>
Signed-off-by: Andrej Kincel <[email protected]>

JUnit: SfcSffToOvsMappingAPI test update

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

Merge "Minor NSH flow bug fixes"

Minor NSH flow bug fixes

- Minor fix for RSP with only one Hop
- Nsi should not be 0 on egress hop
- Minor fix to UT as a result of needing rsp.getStartingIndex()

Change-Id: I8e006e87f0a5284aca764a8406914298e150e433
Signed-off-by: Brady Johnson <[email protected]>

Merge "render grouped rsp to ofl2"

render grouped rsp to ofl2

Change-Id: I9fc513e593cbd55c85ac8acaa762a523eb141f4f
Signed-off-by: shlomi <[email protected]>

Using synchronized Maps in SfcL2ProviderUtils.

Change-Id: Iaa9d59fac937fa37b357a00d94b7943a98acd54f
Signed-off-by: Brady Johnson <[email protected]>

Bug 3184 rsp return name instead of boolean

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

Temporarily removing SFC-Lisp from build as its breaking Jenkins.

Change-Id: I7b844c243f0eda0decbdcc6ba4cf389210b9c888
Signed-off-by: Brady Johnson <[email protected]>

SfcProviderRenderedPathAPITest + POM

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

Merge "SfcProviderServicePathAPI.class, readAllServiceFunctionPath Junit test"

SfcProviderServicePathAPI.class, readAllServiceFunctionPath Junit test

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

Bug 3190 - Removing automatic augmentation names to debug OVSDB issues

Change-Id: Idbab3aad19ee5a8630fff7cc4ee2c2fe7f0ce0fc
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "Bug 3187: Adding mapping list."

Merge "override lisp project junit definition"

Previous sfcofl2 files have been removed to complete the transition to new folder sfcofl2_demo folder

Change-Id: I4953fa9d7ab22f1eed3b613f697718a3bcb38d44
Signed-off-by: Rodrigo Lopez Manrique <[email protected]>

sfcofl2 test files have been moved to sfcofl2_demo folder.
JSON data files that configure ODL have been added to that folder.
Finally, README file to test everything together is included.

Change-Id: I520b02aa40c6aa4a616e6e9180b474ff628fcefb
Signed-off-by: Rodrigo Lopez Manrique <[email protected]>

override lisp project junit definition

Change-Id: Ibe383b43a611b08ac82dc073d3b5e0eaacc6605e
Signed-off-by: shlomi <[email protected]>

Bug 3187: Adding mapping list.

This adds a container to keep mappings needed
by the SFC-OVS renderer. It also adds a list that
keeps mappings of OVS UUID + Bridge Name to SFF Names
in an operational data store.

Change-Id: If9d0e83829b303a80b65d786cbacb0c9038df5e1
Signed-off-by: Thomas Bachman <[email protected]>

Making SfcL2Utils thread safe

Change-Id: I97bc4218b55a0b7e43928810a008cc9ea835922a
Signed-off-by: Brady Johnson <[email protected]>

Adding SFC OpenFlow Renderer Unit Test

- Unit Testing flow counts for VLAN, MPLS, and NSH
- Refactored SfcL2ProviderUtilsInterface to SfcL2AbstractProviderUtils
  since there are many methods that are common to the different
  implementations. Now SfcL2AbstractProviderUtils is an abstract
  class that implements the common methods

Change-Id: I7f8835b48f7a06a7b606f85e0d46ab0a919e3b83
Signed-off-by: Brady Johnson <[email protected]>

SF Tenant ID

Change-Id: I7fad27b8583dad074e899faeadd459be418108a2
Signed-off-by: Reinaldo Penno <[email protected]>

Creating SfcL2ProviderUtilsInterface and SfcL2ProviderUtils

- This allows us to easily isolate the SfcL2RspProcessor and
  SfcL2SfgDataListener classes for much easier Unit Testing.
- patch-set 2, minor compilation error fixed in comments.

Change-Id: I2c2b11a2d4902384538ab1ebf8e013e14f95f53c
Signed-off-by: Brady Johnson <[email protected]>

Merge "Some bugs have been solved and new options added. In addition, the script reads the flows automatically."

Some bugs have been solved and new options added. In addition, the script reads the flows automatically.

Change-Id: I5d3e9abbc4db0aeb82f57868d39c564b9c2f3078
Signed-off-by: Rodrigo Lopez Manrique <[email protected]>

General SFCOFL2 cleanup

- Rename methods from Ingress to PathMapper table
- Move more util methods from SfcL2RspProcessor to SfcL2Utils class
- Clean up SfcL2FlowProgrammerOFimpl action calls

Change-Id: I7fc09ad310eebe9feffd55dbfe21fc9644e9ef0d
Signed-off-by: Brady Johnson <[email protected]>

SfcProviderRenderedPathAPITest: adding unit tests

+ testCreateRenderedServicePathHopList
+ testCreateRenderedServicePathAndState

Change-Id: I3b55b196880769e93c02afbc9e5be7ae2c5ec453
Signed-off-by: Andrej Kincel <[email protected]>

SfcProviderRenderedPathApiTest: moving SFC and SFP creation

Moving SFC and SFP creation into before() block, as SFC and SFP
will be used also in other tests.

The next test patches should depend on this commit.

Change-Id: I23a214b3e41091f51474f9dedd19c27c3f020e39
Signed-off-by: Andrej Kincel <[email protected]>

Merge "Changed typing of SFC-OVS Options."

Changed typing of SFC-OVS Options.

The ovs-options were strictly typed. Unfortunately,
the options in OVS are key/value pairs of strings,
and strict typing prevents the use of values like
"flow" for remote_ip and other options. This patch
converts these types to strings so they can support
"flow" values and can be passed directly to the
OVSDB Southbound.

Signed-off-by: Thomas Bachman <[email protected]>

Removing RSP Listener from sfc-ovs.

The RSP listener isn't needed in sfc-ovs,
as the path wil be constructed using flow-mods
instead of nailed up tunnel parameters.

Signed-off-by: Thomas Bachman <[email protected]>

Merge "render groups to ofl2"

render groups to ofl2

Change-Id: Iaa5bccac7d64bfb6fad123b1e9198b87e05c4a04

Change-Id: Ib5a15feedbd22be8f09b3c527a8224b5156a9c15
Signed-off-by: shlomi <[email protected]>

sfc-ovs moving and fixing unit tests

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

Merge "Bug 3143: On SFF Update operational state is removed before reading its contents"

Bug 3143: On SFF Update operational state is removed before reading its contents

Change-Id: I9fceb8f57e33bdb3ac1916261dbf0fadbc30f68a
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "Bug 3124: Added dependency sfcofl2 to sfc-features."

Fixing sfcodl2 that uses OVS Yang models

Change-Id: I21ffb5ce270609ceeec58434ba0338cdc21a1ca0
Signed-off-by: Reinaldo Penno <[email protected]>

Fixing UI for Cisco Devices

Change-Id: I5c89c4b51e5832e92dc1f61d31ed98176b5f17c0
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "Changing Yang to make Augmentations easiers to code"

Bug 3124: Added dependency sfcofl2 to sfc-features.

This patch also removed munge-maven-plugin from sfcofl2's dependencies, since it caused build failures and it was not used by the sfcof12.

Change-Id: I11c6e9b80dc370f9086f8b6a06890b07de96332c
Signed-off-by: Hideyuki Tai <[email protected]>

Merge "sfc-ovs adding unit tests"

sfc-ovs adding unit tests

SfcOvsToSffMappingAPI, SfcSffToOvsMappingAPI, HopOvsdbBridgePair,
SfcOvsRpc, SfcOvsUtil

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

Merge "Reduce the amount of INFO logging"

Reduce the amount of INFO logging

- Changed most logging to use DEBUG instead of INFO

Change-Id: I9f82663520d93ee2cd70e393c0268c7cbd7383b4
Signed-off-by: Brady Johnson <[email protected]>

Get the OpenFlow node id for OVS SFFs

- If the SFF is an OVS augmented object, then
  get the OpenFlow node id differently

Change-Id: I6d145e0411c5920de69bb0c35c7edfb0e498c8ee
Signed-off-by: Brady Johnson <[email protected]>

Changing Yang to make Augmentations easiers to code

Change-Id: Ia0fcf047525e7f6e13602097d60e803b9d29148e
Signed-off-by: Reinaldo Penno <[email protected]>

Bug 3107: Sfc-OVS lacks API for storing OVS Bridge Openflow ID

Change-Id: I87fbf73eec44d99e4612235085394efa6239abd7
Signed-off-by: Andrej Kincel <[email protected]>

Fix JDK8 compatibility

JDK8 is more picky about javadoc correctness. Fixup errors preventing
compilation.

Change-Id: I6d373b1f2987580ded725c44355806b1fe9249aa
Signed-off-by: Robert Varga <[email protected]>

Merge Layer3Match values for multiple Ipv4 Matches

- If multiple layer3 match fields need to be set, the
  MatchBuilder Layer3Match field was being overwritten,
  instead of being appended onto.

Change-Id: Iecd120056de2a49dc3a98c0a8fd2959553319612
Signed-off-by: Brady Johnson <[email protected]>

Merge EthernetMatch values for multiple Ethernet Matches

- If multiple ethernet match fields need to be set, the
  MatchBuilder EthernetMatch field was being overwritten,
  instead of being added onto.

Change-Id: I2d67060032a870e82270699040b390f730bde90c
Signed-off-by: Brady Johnson <[email protected]>

Disabling SFF/SF/SN initial config files

- IPFIX initial config file is still active
- Created another config file to preserve
 the original in memory data store config

Change-Id: If3e580499113cb53b829a325fdfe68eb1b99bac3
Signed-off-by: Reinaldo Penno <[email protected]>

Debugging Improvements

- Naming threads
- Proper shutdown

Change-Id: Ie41c1698fb79c7f93967a1f2b30908a42adeac0b
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "Removing unecessary debugging log"

Removing unecessary debugging log

Change-Id: I02ee7049a62007f95c2e93cd1e107d3bfc000d13
Signed-off-by: Brady Johnson <[email protected]>

Merge "SFCOFL2 minor cleanups"

SFCOFL2 minor cleanups

- Fix priority issue in Transport Egress table
- Removed some dead code

Change-Id: I0e70a692008fccd0875c351ea4cd2094a859cec3
Signed-off-by: Brady Johnson <[email protected]>

Merge "Sfc-OVS: Fixing NPE caused by non-OVS or hybrid RSPs"

Merge "Add Connected SFF Dictionary into SFF"

Sfc-OVS: Fixing NPE caused by non-OVS or hybrid RSPs

Change-Id: If73f5603a49d27fb8c9709710e02b89f38ff8a4a
Signed-off-by: Andrej Kincel <[email protected]>

Merge "Fixing NSH OpenFlow programming"

Fixing NSH OpenFlow programming

- Set tunnel IP dst, not the inner IP
- Move the vxlan VNID to the dst tunnel
- If the switch port is not avail, use IN_PORT

Change-Id: I210ea87d6d0506166c14eae832bb0e29ad94ed87
Signed-off-by: Brady Johnson <[email protected]>

Add Connected SFF Dictionary into SFF

Yang model service-function-forwarder.yang introduces new
connected-sff-dictionary into SFF. This patch add Web GUI
implementation to fill out the connected-sff-dictionary.

Signed-off-by: Johnson Li <[email protected]>

SFC-PY - prepare for packaging

Move relevant files to the sfc/ package.
Make intrapackage imports relative, fix test/ imports.

Change-Id: I083087a6cc8e7306b6ea2634fb0e55346021debc
Signed-off-by: Dusan Madar <[email protected]>

Merge "Fix UNSTABLE build issue led by unit tests"

Fix UNSTABLE build issue led by unit tests

- Correct *Funtion* to *Function* in file name and function name
- Catch NullPointerException to trace call stack
- Add LOG.debug for debugging
- Print SfcDataStoreAPI Transaction failed with caller info
- Modify Load Banlance scheduler
- Check if a ServiceFunction does exist in scheduler
- Add sleep after getPutAll in order to ensure they are really put
- Clean up all the objects in SFC data store and ensure they are deleted before unit test

Change-Id: Ic4df527b1abc0f84d392e0e024de87a449d6e8f5
Signed-off-by: Yi Yang <[email protected]>

Sfc-UI: adding support for create-ovs-bridge RPC

+ Service Function Forwarders tab now provides access to
create-ovs-bridge RPC call

+ Slightly modified create-ovs-rpc debug messages

Change-Id: I239a114f60f94037dca705b4e8f8be05d9574620
Signed-off-by: Andrej Kincel <[email protected]>

Sfc-ovs: removing NPE catch blocks

- reported by sonar as major issue
- not good coding practice (catching NPE can hide its real origin)

Change-Id: I49138ad4b63b280e8782a5c95512a87753b5b777
Signed-off-by: Andrej Kincel <[email protected]>

SFC-OVS: Creating VXLAN tunnels according to RSP

sfc-test/ - added regression tests for OVS
(as SFF name is based on OVS NodeId which contains ip+arbitrary port,
port must be changed before test execution accordingly. OVSDB guys
are discussing about this arbitrary port in NodeId issue)

sfc-test/common.py - added URL for create-ovs-bridge RPC

sfc-ovs:
+ Vxlan tunnels are created between OVS Bridges according to RSP Hops

+ Vxlan endpoint IP addresses are taken from OVS bridge-other-config
list
  (drawback is, that this IPs must be set manually -
  ovs-vsctl set Bridge br1 other_config={"local_ip"="192.168.1.1"}
  However, this should be solved by OVSDB overlay model ASAP)

+ Vxlan tunnels are destroyed after RSP deletion

Currently only pure OVS RSPs are supported, hybrid RSP will cause
exception and the tunnels will be not configured.

Change-Id: I72ff50b7078a26cce7d44921b0ea9851a471d8c9
Signed-off-by: Andrej Kincel <[email protected]>

Merge "Minor fixes to NSH flow programming"

Minor fixes to NSH flow programming

- For NSH, transport ingress goes to table NextHop
- Transport Egress should not be checking metadata for NSH

Change-Id: I199dc1025e11015f1772ce18293e1185fc0a2163
Signed-off-by: Brady Johnson <[email protected]>

Merge "SFC-PY - rename directory nfq_classifier ro nfq"

Merge "SFC-PY - move/remove unused files"

Unit test for readRenderedServicePathFirstHop and readRspFirstHopBySftList

This unit test can block some commits that bring regression.

Change-Id: Id9edf2edb672907ab2e49ab12e7575dd728f9b90
Signed-off-by: Yi Yang <[email protected]>

Adding NSH to flow programming

- no longer using table 2, classifier

Change-Id: I5e49944cb9d5b83168e9c7d19ef33c0cd7cb589f
Signed-off-by: Brady Johnson <[email protected]>

SFC-PY - move/remove unused files

Remove test/__init__.py.
Move service_function.py and start_sf.sh to unused/.

Change-Id: I1f1963a7a073d6d87721614ea121f49bf5b8e228
Signed-off-by: Dusan Madar <[email protected]>

SFC-PY - rename directory nfq_classifier ro nfq

Change-Id: I760d818090b7502d46ff546951ad52ed21873f44
Signed-off-by: Dusan Madar <[email protected]>

Statistics for Cisco vNBAR and vASA SFs

Change-Id: Ic1f824548b46229528e3a654ef083ad30cff71c0
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "Service Function SL-Transport and SFF mapping"

Service Function SL-Transport and SFF mapping

- patch-set 2 Added list of SF types that map to a
  list of SFs.

Change-Id: I8835ef155535c5239320d34050a4adb7331a90d0
Signed-off-by: Brady Johnson <[email protected]>

Adding Maven Central Metadata to pom

- This allows SFC to meet the Maven Central requirements

Change-Id: Ib7366e15666d44f844caca48691a36b5b505de06
Signed-off-by: Brady Johnson <[email protected]>

Merge "removed XR parameter from start_agent added policy-map and interface configuration processing"

removed XR parameter from start_agent
added policy-map and interface configuration processing

Change-Id: I74ad18321015728f9201fb02a5f7831052436b2c
Signed-off-by: jguichar <[email protected]>

sfc-ui: Add UI for IPFIX (Matchers and Add/Remove AppId)
sfc-model: BUG: It was not possible to add a new AppId thru the REST method 'PUT' as multiple keys were defined

Change-Id: Idd7b0687ceae6e08cb5e1dccaa38dfe880e39417
Signed-off-by: Christophe Fontaine <[email protected]>

Merge changes I48e300f0,Id6648e3f

* changes:
  SFC-PY - scapyNSH
  SFC-PY - create cli subpackage

Merge "Sfc-ovs: seperating config file"

SFC-PY - scapyNSH

Move the scapyNSH.py module to nsh package, remove the scapy package.

Change-Id: I48e300f066d9d1bce73f0f1f7d6675d1d8458cf8
Signed-off-by: Dusan Madar <[email protected]>

SFC-PY - create cli subpackage

Move xe_cli, xr_cli and ovs_cli to a cli subpackage, update related imports.

Change-Id: Id6648e3f2b15b94a68806998179ff698932406a2
Signed-off-by: Dusan Madar <[email protected]>

Fixing get first RSP Hop RPC due to previous omission.

- A previous patch to add SFG left out this code,
  adding it back now.

Change-Id: I7bf6d08a549ae1ab2fa84296b266cde070368d49
Signed-off-by: Brady Johnson <[email protected]>

Sfc-ovs: seperating config file

Change-Id: I74157f27b642199dc22d6e7ede22e6a820e2eb2b
Signed-off-by: Andrej Kincel <[email protected]>

Merge "Sfcofl2: seperating config file"

Sfcofl2: seperating config file

+ tested that RSP listener works

+ added sfc-provider to <required-capabilities> of sfcofl2-initial.xml

- there are still some errors, but probably not related to config file

Patch set 5:
Fixed missing dependency of sfcofl2/xml/config

Change-Id: I899a65a67bdf2ff144eca16b6baff53f1e8cf2aa
Signed-off-by: Andrej Kincel <[email protected]>

Fixing Start Agent

Change-Id: I44b62f56527dc7dfcb2e19978300dc9216ae0bfd
Signed-off-by: Reinaldo Penno <[email protected]>

Merge "fixed build errors added CLI processing for IOS-XR"

Merge "Add shortest path algorithm for service function selection"

Generating XML from new Identities

Change-Id: I971437cff0a4f286d6adc127a22b0698b8533fcd
Signed-off-by: Reinaldo Penno <[email protected]>

Identities for Cisco Platforms

Change-Id: I7077771c63675ae4f7971d92368a822bf2330076
Signed-off-by: Reinaldo Penno <[email protected]>

fixed build errors
added CLI processing for IOS-XR

Change-Id: Id3928c3cefab662eb7f8822388131e5a62fc55e5
Signed-off-by: jguichar <[email protected]>

cleaning sfcofl2 POMs and configs

- Cleaned sfcofl2 POMs
- Commented out a config file that is not used anymore
- Fixed 80-sfc.xml but still let commented out
- Removed .m2 and compiled and ran control plane regression tests
   it was ok

Change-Id: Ifc212c78fcde511dd3aa4e1e687e048f273258b3
Signed-off-by: Reinaldo Penno <[email protected]>