Merge "Fixed EIC grouping"

Merge "Revert "Create the tunnel port in OVSDB, and connect.""

Revert "Create the tunnel port in OVSDB, and connect."

This reverts commit 967912af4cdcf89df665579708af27c51c808d9b.

Change-Id: I98ede9979ca8b0ce6eab26439ea9c649d975a714
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Fixed EIC grouping

Signed-off-by: Martin Sunal <msunal@cisco.com>

Merge "Removing legacy distribution."

Create the tunnel port in OVSDB, and connect.

This patch creates a tunnel port for ofoverlay, and
optionally connects it to the controller (set by member
in the class).

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

Added feature dependency on odl-ovsdb-southbound-impl

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

Removing legacy distribution.

This removes the (legacy) distribution build from
the repo, as it is no longer used and/or needed.

Change-Id: Id1481e6c90b8eebbaef5022c4dac26be8614aa17
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Set odlparent, clean-up of pom.xml-s

Change-Id: I76ba8a551755ca30347fba59750ec0d7d02a1dad
Signed-off-by: Martin Sunal <msunal@cisco.com>

Backed out SFC Manager.

SFC Manager is removed -- will be replaced by
a subsequent patch.

Change-Id: Ifaba8e77eac8da7428ec959cf02b69fa4d5f9471
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Merge "Move JSON-RPC lib to OpFlex."

Move JSON-RPC lib to OpFlex.

The JSON-RPC library is only used by the OpFlex
renderer. This patch moves the library under that
renderer for now (can be moved to a more general
place if it's needed by more than one renderer).

Change-Id: Icbefa208b63b0a36967f0834d7e7fbcf14bd4ac2
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Fix order of base feature loading.

The order of the features in the features.xml file is
important -- this patch fixes the order so that the
ofoverlay feature comes up correctly.

Change-Id: Idf7c5e9ce7c026a67f7dd3c913f35abcea979119
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Fixes for FlowTable in OFOverlay

- Added tunnel ordinal, removed VNID->sEPG
- Fixed FDID tunnels
- Remapped DestMapper to set above VNID
- Fixed bug in SourceMapper (object identity vs equality test)
- Assured that only BD-BD communication allowed for L2 Flows
- Set foundation for fixing conditions and implementing distributed
policy enforcement.
- NeutronMapper: set DHCP EPG to IGP Deny

Change-Id: Ic66e56b25700cea6a68815b86175e7909482dab9
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Merge "Routing fix in preparation for routing table support."

Merge "Parameter of classifiers changed in POC"

Routing fix in preparation for routing table support.

Need to refactor to ensure that local routing occurs with source subnet gateway,
as well as final destination MAC.

Change-Id: I1dc25728b2750eb273bf31a08401759b931fa952
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Additional Enhancements to the Endpoint RPC Registration
1- Allowed RPC registration to have its own dedicated thread pool since
   its shared among multiple renderers.
2- Made renderers only return their augmentations to RPC registration
   without being involved in building endpoints (which only handled by
   the RPC registry itself).

Change-Id: I5075404f2137ee5cb6df5bd5479dd8138ee4bb5c
Signed-off-by: Khaldoon Al-zoubi <khalAlzoubi@gmail.com>

Fixing concurrent access errors.

Change-Id: I3e7ba5760d396a646ab37e1e832f6ef2435779ba
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Distributed multi-virtual-router functionality.

- allows specification of gateway ports
- correct MAC rewrite based on src gw/dst gw
- multiple isolated router support
- multi-tenant support.

Change-Id: Ifad952a26cdf97eb13b60d2ea80ebae28fdecda5
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Enable neutron mapper

Change-Id: Idc06e58acc3cbeafa467c6a46edae495c2217448
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Added support of multiple routers from neutron

Limitation - you cannot create more than one router interface in the same subnet

Change-Id: I3ef30eb340a67ae3907669c05aa04c748dbe8fed
Signed-off-by: Martin Sunal <msunal@cisco.com>

Registration of NeutronRouterAware in neutron-mapper

Signed-off-by: Martin Sunal <msunal@cisco.com>

Updated references to latest  karaf versions.""

This reverts commit a49d6d0260c19292f525347d8f421b7738b5064a.

Change-Id: Iee5259a1a93cded3602ae2fc28c27bee5f6075b0
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

Revert "Updated references to latest  karaf versions."

This reverts commit c7e7ce1e5a1ee1112f44851aeb2da5262123e765.

Change-Id: I4d95b108f723127c3b3730b0fb6f0fa3f79b52c0
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Updated references to latest  karaf versions.

karaf.version is inherited from odlparent.

Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

Add SFC features to the GBP distribution.

This adds the SFC features to the GBP distribution build.

Change-Id: I7e0ab08dd288baf5bd01357419329b62500586e7
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Parameter of classifiers changed in POC

parameter 'type' of string value changed to parameter 'proto' of int
value.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Empty string checking for subnet name

Empty string is not valid value for subnet name.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Add ARP flow to Policy Enforcer.

This adds ARP flows to the policy enforcer, which
allows packets to EPs in the same Flood Domain.

Change-Id: Ie27b856b2e1ef61d6ff00d8b9029902e93d2e13a
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Introduced neutron-mapper

- dependecy on ODL neutron-northbound service
- Mapping between neutron and GBP entities:
  - neutron network to gbp l2-flood-domain mapping
    l2-bridge-domain is generated as a parent of l2-flood-domain
    l3-context is generated as a parent of l2-bridge-domain
  - neutron subnet to gbp subnet mapping
    l2-flood domain is set as a parent of subnet
  - neutron port to gbp endpoint mapping
    endpoint is registered
    endpoint-l3 is registered if a port contains fixed-ips
  - neutron security group with security group rules to endpoint group pairs with contract

Change-Id: I1fea5cb67ebd7d080cf244ecc2b1da5072efd181
Signed-off-by: Martin Sunal <msunal@cisco.com>

Added checking at DestinationMapper

createRouterArpFlow in DestinationMaper is checked for null value.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Add WARN messages when no tunnels configured.

This adds checks and warnings when the IP address
and/or tunnel port can't be found when constructing
flow-mods.

Change-Id: I6e137e43801169511babf0f1a42e595493bd8692
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Merge "Minimize flow-programming."

Minimize flow-programming.

This patch changes the flow programming to perform
deletions and additions to the flow table, rather
than doing a wholesale update of the flow table.

Change-Id: I81e584b4415900b9e1bd1b6a04fe3aecc9f12c49
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Bug 2814 - logical OR behavior of classification within a rule.

Implemented matching against all the classifiers within a rule.

Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Publishing of ofoverlay augmentations, fixed port-name augmentation bug

Signed-off-by: Martin Sunal <msunal@cisco.com>

Fix for missing flow-mods for L3 context changes.

This is a workaround for making sure that all the
flow-mods are on the vSwitch.

Change-Id: I54b9303568ba766431f015fba8562919f4f772f5
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Merge "Bug#2977 EndpointManager maps are not threadsafe"

Merge "Added check for tunPort existance and made non-null precondition for adding a flow to FlowMap."

Added check for tunPort existance and made non-null precondition for adding a flow to FlowMap.

Change-Id: Id0c9de5195efab5687cef7e4ea7bdfca54c6021a
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Bug#2977 EndpointManager maps are not threadsafe

Change-Id: I0a05ff95e7fc2e51ad64fcd3ac425d9119a0fe29
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Fixing mistake of having port-name in base and not augmentation.

In lieu of NB API consume augmentations

Change-Id: I9f3d390cdc413ccef8e2e28b46cb66bcc1af10a5
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Adding odl-groupbasedpolicy-base to feature dependency.

Change-Id: I5be694ba13735c52e08fd5db16ed13eae68a2a80
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Merge "Removing OpenContrail renderer from the build."

Adding multiple EPG capability to EPs and IntraEPG policy

Change-Id: I00ed21b0765912c689c57c72c1b4463544bf1a73
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Removing OpenContrail renderer from the build.

Refer following email:
https://lists.opendaylight.org/pipermail/groupbasedpolicy-dev/2015-April/001054.html

Change-Id: I8d308ec277d9531c148942c9c388d3fe5a533686
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Merge "Cleaned formatting (per ODL standards) and whitespace."

Exported package for classifier-definitions and action-definitions

This allows to use classes from this package in other bundles.
Added javadoc comments. Corrected visibility of class members on API.

Signed-off-by: Martin Sunal <msunal@cisco.com>

Merge "Add <relativePath/> to ensure Maven pulls artifact from Nexus"

Make members immutable where possible.
Cleanup code slightly and make Sonar a little happier.

These changes are related to Bug 2196

Change-Id: I5c52831c23dfbe72f21a2e8b4a467386eb1a29e7
Signed-off-by: Tom Flynn <tom.flynn@gmail.com>

Merge "Classifiers - implementation changes. This commit solves bug 2883."

Classifiers - implementation changes.
This commit solves bug 2883.

Change-Id: I1b5b886734833bd30129c71be78eb3a5af4387a8
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Cleaned formatting (per ODL standards) and whitespace.

See https://git.opendaylight.org/gerrit/#/c/17575/ for
eclipse-java-clean-code-style.xml.

Only did this for files associated with https://git.opendaylight.org/gerrit/#/c/17391/

Change-Id: I430c5ef0a409bc6dc8b59c966ffd9e6ca6e57873
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Merge "Modified model to support L3Prefix EP, GIC, EIC, ECC and EIG"

Modified model to support L3Prefix EP, GIC, EIC, ECC and EIG

policy.yang:
Added GroupIdentificationConstraints:
- added role "any" for matcher
- added case GroupNameConstraint
- added case for provider|consumer matcher
Added EndpointIdentificationConstraints
- added l3-prefix ip-prefix type constraint
Added ExternalImplicitGroup

endpoint.yang:
Added L3-prefix list.

Other files refactored.

Change-Id: I572d0208ca88f7182a33e41f4ddedcd46ec3015d
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Add <relativePath/> to ensure Maven pulls artifact from Nexus

Needed by autorelease to be able to find and replace this value
prebuild.

Change-Id: I39ee4f08f607d4a9381f972501abbed9416015b4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Added java code formatter and formatting of opflex java files

Java formatter is added groupbasedpolicy/commons/cleanCode/eclipse-java-clean-code-style.xml
Contributors should use this java formatter. It ensures the same look and feel of a code over GBP project.
Java files in opflex renderer have been formatted by this formater.

How to set formatter in Eclipse:
Window -> Preferences
          -> Java
             -> Code Style
                -> Formmater: Import...(eclipse-java-clean-code-style.xml)

Signed-off-by: Martin Sunal <msunal@cisco.com>

Merge "Move utility function to common place."

remove printStackTrace calls from EndpointManager.java and OpenstackGbpEndpoint.java and replace with error logging.

Change-Id: Ieed6f892cd75b064610ba53bf6b00764fecdfe92
Signed-off-by: Tony Klink <tony.klink@intel.com>

Merge "Marked OpenstackGBP API Deprecated, cleaned up minor todos at same time, ready for TODO sprint."

Scope change for OfTable.

The OfTable class provides protected acces to OpenFlow Overlay
renderer classes for the Flow Tables (e.g. SourceMapper,
DestinationMapper, et. al.). This limits access to just
the Flow Table classes themselves. This patch moves that
to a separate class with private members and public getters
so that the state can be accessed by any class that has the
new object (e.g. Action classes will use this in future patches).

Change-Id: I21aefa959c97453cdfa8f7f5b668f468dfd7aa5d
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Move utility function to common place.

The utility function is helpful byeond just the flow
table use cases.

Change-Id: If1578fe6dd680b956d1be5bb6609987cdbaff2ad
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Implementing portrange in L4Classifier.

Renaming createUdpMatches and createTcpMatches arguments.

Change-Id: I386283e833a2b4986057563f8b7db6a9ed4f2347
Signed-off-by: Konstantin Blagov <kblagov@cisco.com>
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Revert "Implementation of IP address classifier. Functionality is blocked by bug 2866."

This reverts commit d62684b701f0a0e94861bb889680979705350c8c.

Change-Id: I1cf3e0654fc3520d129383de8e85a41934664f02
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Marked OpenstackGBP API Deprecated, cleaned up minor todos at same time, ready
for TODO sprint.

Change-Id: Ic87fc3d6146464cc4cfde3ba470a45f2cd83f5b3
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Implementation of IP address classifier.
Functionality is blocked by bug 2866.

Change-Id: Iec272e5422c9f4002064c04446f2ec1cd99752e9
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Merge "Added support for multiple Actions."

Added support for multiple Actions.

This patch adds support for using multiple actions
in the OpenFlow Overlay renderer.

Change-Id: I07e8e80a9012db378e765478751d175cae29a82b
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Shared Endpoint RPC for multiple render

This patch allows multiple renderers to share Endpoints RPC registration.
This is needed to allow multiple renderers to run together, allowing them
to access Endpoints store concurrently. The solution idea is to have
endpoint RPC registration as singleton. Each renderer then needs to
supply this singleton object with its Endpoint specific augmentation.
Upon endpoint registration RPC call, the singleton then loops over all
renderers to build all augmentations.

Change-Id: I0fe8bee6d8e92ffd2c3268009336da587cb497fc
Co-Authored-By: Khal Al-Zoubi <khalalzoubi@gmail.com>
Co-Authored-By: Yapeng Wu <yapengwu@gmail.com>
Signed-off-by: Yapeng Wu <yapengwu@gmail.com>

Merge "Adding NSH Matches and Actions."

Merge "Adding feature for OpFlex Renderer."

Adding feature for OpFlex Renderer.

This adds the OpFlex renderer feature, allowing it to be
loaded and run.

Change-Id: I0d2446674c759ef9f69011bee7cc7fc55442774d
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Integrated with SFC to make RPC call.

This calls the SFC the RPC to get the Rendered Service Path (RSP).
This will be migrated in a coming patch, but provides the demonstration
of GBP making the SFC RPC call.

Change-Id: I4dc6acf042a3cb70853f39e7469dd21cc504bca6
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Adding NSH Matches and Actions.

This adds support for OpenFlow Matches and Actions
for NSH fields (NSI, NSP) to FlowUtils.

Change-Id: I9f3a0f49e0a4b658a4b6c4e8a8fe79a882c179e8
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Fix for neutron issue - use karaf-parent

This patch should fix the neutron issues being seen.

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

Remove errant checkin of Unit Tests.

A previous gerrit erroneously checked in these unit
tests, as they already exist under the groupbasedpolicy
main directory/bundle.

This patch also adds the directory used only for unit
testing in the ofoverlay renderer to .gitignore.

Change-Id: Iead96518c7bdff119fa0502a821a98e4cc914d3e
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Merge "Increased coverage of InheritanceUtilsTest."

Merge "Yang errors fixes: - fixed keys - restored 'config true' state in references - changed 'config false' to 'true' in subject-feature-definitions"

Merge "Separating renderers into features."

Increased coverage of InheritanceUtilsTest.

Change-Id: Ie6182a32231b76dc549d813078f67776e783810f
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

Yang errors fixes:
- fixed keys
- restored 'config true' state in references
- changed 'config false' to 'true' in subject-feature-definitions

Change-Id: Idc509de204d72d4db30f26a0048ecd9fb3ed00c8
Signed-off-by: Konstantin Blagov <kblagov@cisco.com>

Separating renderers into features.

This patch separates the renderers into their own bundles,
and makes them their own features. This allows per-renderer
installation. This is needed in the near-term in order to
allow multi-renderer development to progress. The renderers
may be combined into a single bundle later, once we've worked
out how multiple renderers can coexist completely.

Change-Id: If15992174ef98298a75a3dc5c4d47d22f207dccb
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

added target-ide to .gitignore

Signed-off-by: Martin Sunal <msunal@cisco.com>

Added range type to subject-feature-definition/parameter

Change-Id: If770711b5c947024d0a20227f445dbc12a65eb00
Signed-off-by: Konstantin Blagov <kblagov@cisco.com>

Merge changes I4fa379a3,I0c63e69a

* changes:
  Remove <repositories> section for contrail
  Remove <repositories> and <pluginRepositories> sections

Remove <repositories> section for contrail

The contrail repo is mirrored by nexus.opendaylight.org so we should be
pulling from our mirror.

Change-Id: I4fa379a354f97eca18afc45d173baade27bd85da
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

SFC+GBP Integration

Change-Id: I2669235bd39249eca1e5488517284f2d7c748794
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>

Remove <repositories> and <pluginRepositories> sections

It is recommended that developers and servers configure this locally via
settings.xml.

https://lists.opendaylight.org/pipermail/discuss/2015-January/004482.html

Change-Id: I0c63e69a70b72b3b1994af57d17e3db89e3c7d46
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

Merge "SwitchManager: getSwitchState() should not return null"

Some thoughts for SFC Integration.

This patch is just meant to kick off some initial thinking
about what an SFC/GBP integration might look like. It creates
a manager that listens for ActionInstance updates, then gets
the ActionDefinition that it references to see if the action
name is meant to direct to a Service Function Chain, and if
so, uses the chain name provided in the ActionInstance to
make the call into SFC to get the RendereredServicePath, by
name.

Change-Id: I8fbc5082c697d96d737b784a431cc484534ce715
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

SwitchManager: getSwitchState() should not return null

getSwitchState method populates switch state to switches in thread-safe
way. When race occurred, it should return already populated one.
The callers of it, updateSwitch and updateSwitchConfig, access the result
without null check. This is found by code review.
This semantics is same to other similar helper methods, getEPNGSet(),
getConfdGroupOrdinal(), getContextOrdinal().

Change-Id: I88d03a8f0b0109921377bc1fd4628a072c6b0552
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Fix build after openflowplugin merge.

This fixes a build breakage caused by a merge in the openflowplugin project
which enabled flow programming models/features.

This patch also re-enables the single-feature-test that
was broken when moving this from yangtools to odlparent.

Lastly, this patch removes the OpenContrail feature from
automatic startup (we're migrating to per-renderer features
in a subsequent patch).

Change-Id: I09382b2cef32efbd542d45c070280e1963858c80
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>

Do not override netty version

odlparent defines it to 4.0.24, no need to redefine it as an older one.

Change-Id: I4f300c9f0802b6a4dff3c6fcbe8831d9fa7c3805
Signed-off-by: Robert Varga <rovarga@cisco.com>

This commit includes OpenContrail OC Renderer support.

Change-Id: Ie650b1223fab200fe68229a91405ec7e54bc1157
Signed-off-by: RajaniS <srivastava.rajani@tcs.com>

Merge "IndexTenant: resolveSubnet() should not return null"

IndexTenant: resolveSubnet() should not return null

As the comment of the method says, it shouldn't return null.
Instead it should return empty set.

Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

Added NPE check on Endpoint portName.

Change-Id: Ic88a4fa0019cc061b4b4faf5af60a1e19fa0f5d1
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Adding endpoint registration using port-name.

Change-Id: I00921958116a805fdbad541b6f391ea6b5197a72
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>

Fix build by referencing correct dependencies.

This patch fixes a broken build by pulling in the
correct version of PAX exam. It also migrates the
karaf container from 3.0.1 to 3.0.2.  This fix should
eventually be replaced by a patch that converts to the
pom/project structure, as per the ODL "best practices"
that is defined in the archetype.

Change-Id: Ia626643c2cdb2bedc2b9df08cc267a8aa9902ad1
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>