Switch to using instanceidentifiers for managed-by and manages references

This is done because instance-indentifiers are easier to work with :)

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

MD-SAL OVSDB SB - handle deletion of Ovsdb Nodes

This is a first draft for handling deletion of
Ovsdb nodes that were added via restconf.

This first patch cheats to get things working.  Need
a method in disconnect() to find the Ovsdb client.

v2 - fixed problem lloking up Ovsdb client.
v3 - rebased against Ed's patch - gerrit 15043

Change-Id: Ie2804b50c5205c2d1d2ca44fa17a64db3518b8a2
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Signed-off-by: Ed Warnicke <eaw@cisco.com>

Basic wiring for OVSDB updates

This patch wires in OVSDB updates via monitor, and hands
them off to a callback that (to date) logs them.

I've tried it out with some simple cases, and it appears to
be working.

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

Merge "Fix namespaces for dpdk yang files"

Merge "Remove ComponentActivatorAbstractBase from plugin"

Fix namespaces for dpdk yang files

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

Remove ComponentActivatorAbstractBase from plugin

Patch Set 3: remove some unused imports.

Change-Id: Ib656201f3a2d5598b96e13774620e283c6547114
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Remove openflow10"

Revert "Revert "Adding support for DPDK datapath_type and port_types.""

This reverts commit 96cabf057a4ab117c5bf6f615f00841ca262494c.

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

Merge "Re-enable southbound build."

Re-enable southbound build.

After some investigation, this turns out to be a deeply adverse interaction
between pax-exam 4.4.0 (and 4.0.0-4.4.0) and mirrors in the infra.

Since I believe we need to go to at least pax-exam 4.0.0 to get to karaf
3.0.2 to get to Java 8 (or so I recall from talking to Robert), the mirror
thing in infra has been fixed (nobodies preferred fix).

This patch should now verify, and the build should be restored.

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

Merge "Revert "Adding support for DPDK datapath_type and port_types.""

Remove openflow10

Follow up from https://git.opendaylight.org/gerrit/#/c/14968/
to remove dead code newly made.

Also re-enabled test in NeutronIT: testGetOpenflowVersion()

Change-Id: I705ab9e6046947c20349a2fb6906ca9d248e8085
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Revert "Adding support for DPDK datapath_type and port_types."

It appears this patch only passed verify because southbound was not building.

This reverts commit feec58a6b62fde434e7972b172f254a996bea6c6.

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

Merge "Remove of10provider"

Remove of10provider

This helps to remove the switchmanager and forwardingrulesmanager adsal dependencies. switchmanager is still needed by net-virt so that will be fully removed in a later commit.

Patch set 2: Reenable the NeutronIt and OvsdbNorthboundIT
             Add fix for previous commit with uriInfo that was breaking the OvsdbNorthboundIT
             Incorporate review comments.

Change-Id: I7ae8b30784d2d6d9f34639ed420805a8cb34afc7
Signed-off-by: Sam Hague <shague@redhat.com>

Adding support for DPDK datapath_type and port_types.

This patch creates yang models to support datapath and port types.
datapath-port-types.yang is a general purpose datapath and port types model.
dpdk.yang is an extension to add dpdk specific ports and datapath_types.

Change-Id: Iffbf04631a5546cdc1b8f73bafc53ff5ca65d7f1
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Remove sal.connectionservice

Patch Set 4: Add ConnectionConstants.
Patch Set 5: Add pom files.

Change-Id: Ifde85d6a76fbec683f7cb7563802ca8e61c30e9c
Signed-off-by: Sam Hague <shague@redhat.com>

Fix for OVSDB compilation failure

- Legacy distribution was removed but top level pom still had child module
  which causes a fresh tree to fail compilation.

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

Merge "REVERT-ME: neuter southbound module."

REVERT-ME: neuter southbound module.

Change-Id: I37c819bdde192a64ce27436b45f13e6509404a87
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Remove legacy distribution

I think (I checked with flaviof on IRC) this is just
making build times longer and is not used.  If so,
this patch should make builds faster.

If its doing something useful, let me know ;)

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

SonarBugFix:
Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>
Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>

SonarBugFix:GenericTableSchema
Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>

Sonar bug Fixes

Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>

SonarBug:Remove unused variables

Conflicts:
northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV3.java

Change-Id: I4bbdcc9517966f91230987b09ae7cd27f6d845c2
Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Add more detail to trace logging in JsonRpcEndpoint"

Merge "BUG-1173: do not mention guava.version"

Add more detail to trace logging in JsonRpcEndpoint

Change-Id: I4ecf87c4c855a137d069507d251e6e0839970cc1
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Fix for Sonar bugs Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>"

Merge "Rough musings towards an MD-SAL OVSDB SB"

BUG-1173: do not mention guava.version

Guava dependency is declared from odlparent, no need for version here.

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

Fix for Sonar bugs
Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>

Rough musings towards an MD-SAL OVSDB SB

This patch is incomplete, it only manages to accept
ovsdb connections and log them, but its a start.

PatchSet2: Added a simple starting model around tunneling
PatchSet3: Added additional tunnel info
PatchSet4: Added ovsdb.yang model.  Separated tunnel into tunnel.yang
PatchSet5: Renamed tunnel.yang to overlay.yang.  Added topology-type info.
PatchSet6: Added in dummy DataChangeListener for OvsdbNodes.
           Moved mapping functions into a mapping class.
           Handled tracking of OvsdbClients
PatchSet7:  Responded to comments:
            Fixed whitespace
            Fixed parent for aggregator
            Fixed features from odl-southbound- to odl-ovsdb-southbound-
PatchSet10: Added DataChangeListner to listen for new ovsdb-nodes in topology
            and connect to them.
PatchSet15: Response to Colin's comments
PatchSet18: Fixed feature dependencies.  Depends on patch
            https://git.opendaylight.org/gerrit/#/c/14791/ in controller
PatchSet19: Fixed small error in startup order

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

Remove plugin projects dependency on ad-sal clustering.
Currently plugin code is not using any feature of clustering in the existing code. Removing this unnecessary dependency

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

Merge "Fix 'Row cannot be cast to Interface' exceptions"

Fix 'Row cannot be cast to Interface' exceptions

This patch modifies NetworkHandler and PortHandler to call
ovsdbConfigurationService.getTypedRow()

Change-Id: Ifef438257091c56db05508fcad3b8973fd93a7e5
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>

Merge "Remove deprecated comment."

Merge "Added unit test BridgeConfigurationManagerImpl.java"

Remove deprecated comment.

Change-Id: I49b9028958c25cf44ae2b8d9129194239358011f
Signed-off-by: Sam Hague <shague@redhat.com>

Added unit test BridgeConfigurationManagerImpl.java

Patch Set 2: Added dependency for tests to pom.xml
Patch Set 3: Add review comments.

Change-Id: I8bc96fc2dee23e8d7f7b28cb033d6a25ca417297
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Added unit test LoadBalancerConfiguration.java

Patch Set 2: Rebase
Patch Set 3: Add review comments.

Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>
Change-Id: I4d743389eacd7b3d7c2f4f6174ceab90e760c75e

Bug-2658 - Remove adsal and migrate to mdsal

Clean up pom file dependencies.

Change-Id: I3b715ad3353fa269f2b9880a30ab8f1fe4720d1f
Signed-off-by: Sam Hague <shague@redhat.com>

BUg-2658: Remove adsal and migrate to mdsal

Remove networkconfiguration.

Change-Id: I571a39a7b933ef59634e10e8ebf8d052c1c31b45
Signed-off-by: Sam Hague <shague@redhat.com>

BUG-2658: Remove adsal and migrate to mdsal

The patch removes the deprecated BridgeDomain api.

Change-Id: I6e731183cb1c97e2c0e62ac90759d96a97bbb087
Signed-off-by: Sam Hague <shague@redhat.com>

BUG-2658: Remove adsal and migrate to mdsal

This patch removes the deprecated connection and configuration services.

Change-Id: I7fb47f6bff838a591fa9405d50a3753815e4b246
Signed-off-by: Sam Hague <shague@redhat.com>

BUG-2658: Remove adsal and migrate to mdsal

This commit covers removing adsal-compatibility.

patchset 2: Remove adsal-compatibility from ovs-sfc features
patchset 3: Really remove the adsal-compatibility from ovs-sfc features.
patchset 4: Apparently not
patchset 5: Trying again

Change-Id: I7f011820488a1fa4a1e29967cf251640562e0b89
Signed-off-by: Sam Hague <shague@redhat.com>

Enable OVSDB northbound V2 integration tests.

Change-Id: Id764c4ba12b7059ea991a32d7a862247ca4230f9
Signed-off-by: Sam Hague <shague@redhat.com>

Move library integration tests to integrationtest dir

Change-Id: I21730ce95d4af60664a6b53b5a188d0f18febce3
Signed-off-by: Sam Hague <shague@redhat.com>

Move bridgedomain it to the intergationtest bundle

Change-Id: I147ca9496f248e36fe20500f7632122833b9f35d
Signed-off-by: Sam Hague <shague@redhat.com>

Fix broken ovsdb build due to commit in openflowplugin

See:  https://git.opendaylight.org/gerrit/#/c/13234/
      https://git.opendaylight.org/gerrit/#/c/14289/

NOTE: ovs-sfc feature is being disabled for the time being, as it is
      not used for anything.

Patch 1: fix build
Patch 2: complete the cleanup
Patch 3: Enable ovs-sfc, add feedback from code review
Patch 4: Coalesce openflowplugin.version-* constants into openflowplugin.version
Patch 5: Fix ovs-sfc single feature test

Change-Id: I3d307e41165c5872844ed76447c083dd84bd5522
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Remove deprecated BindingAwareProvider methods

https://git.opendaylight.org/gerrit/#/c/13806/

will remove deprecated BindingAwareProvider methods.
This patch simply removes them from
implmementation of that interface so when 13806 is
merged we can merge this to fix.

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

Set root pom.xml <name> for Sonar

As mentioned on the mailing list Sonar uses the <name> field of the
pom.xml that is passed to the mvn command as the name of the project in
Sonar. In most cases this is the root pom.xml file in a project. This
patch sets the name to the project shortname.

https://lists.opendaylight.org/pipermail/discuss/2014-November/004024.html

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

Merge "Enable SSL two way authentication"

Merge "Updated error catch for deleteRow ConfigurationServiceImpl.java"

Enable SSL two way authentication

With this fix the ovsdb server will provide ssl connection with two way authentication.
Both server and client will authenticate peer certificate.
The method of getting peer certificate is also provided in ovsdb connection info.

Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>

Updated error catch for deleteRow ConfigurationServiceImpl.java

Logged more specific information from caught error and updated
error message format to match best practices.

Change-Id: If43e49b0544a5efba85a71dc0d227eca627854b5
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Fix logs in how it should use exceptions.

While debugging issue with openstack CI, I identified a number of places where
exception was not doing the logging properly. Thus, this change set.

Ref link on logging:
https://wiki.opendaylight.org/view/Logging_Best_Practices

Patch 2: minimize the changes, but yet follow the Logging_Best_Practices.
Patch 3: missed change in same file, to keep changes consistent on patch 2.

Change-Id: Ie3dae66f24467ee2dd1113e9c0dd6a5d6ab0df5a
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Add fixes for SFC data model changes.

This fix is really just commenting the code out until we get around to completing the OVS-SFC feature. The SFC model will likely change before then so it is best just to comment out the existing code to avoid any other build failures.

Change-Id: I081f000b0ab47a3eb59668a04c061db3de4ed909
Signed-off-by: Sam Hague <shague@redhat.com>

Restructure plugin IT tests to reuse TestBase methods

Patchset 2: rebase

Change-Id: I93baca136e5dc0b6da46d834c11a7ed69999d44b
Signed-off-by: Sam Hague <shague@redhat.com>

Add TestWatcher so we know what test is running

Patch 2:
  - move testWatcher to base class
  - convert System.out.println in OvsdbPluginV3IT to use logger

Patch 3:
  - remove logs from mocked class (they never get called due to mock)

Change-Id: I21902bcd7595b16c8951ca04d1883c0745da6ba0
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Bug 2460 - Converting ipv4 to ipv4Prefix requires mask

Starting on fixes for Bug 1953, the validation of IPv4Prefix
will make sure mask is being provided.

Patch Set 2: Move the +"/32" to a common utility function.

Ref gerrit: https://git.opendaylight.org/gerrit/#/c/11384/

Change-Id: I84771d087d7ed1ec5cc8045e3efe3673e6969d5c
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Merge "Add OVSDB Northbound v3 postman collection"

Add OVSDB Northbound v3 postman collection

Change-Id: I779c8df46565e5efe503b9077e580a582c4c45af
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "printCache: Error executing command: java.lang.NullPointerException"

Merge "Add template unit test for schemas/hardwarevtep"

Merge "Add template unit test for schema/openvswitch"

Update README with instructions on how to update bundles in karaf

Change-Id: Ied0613a4ec961f668c5b5587cd65b3f13edfcfef
Signed-off-by: Sam Hague <shague@redhat.com>

printCache: Error executing command: java.lang.NullPointerException

Change-Id: I91db524cd01ede91330c97a7176b96b2626c4a24
Signed-off-by: Sam Hague <shague@redhat.com>

Add template unit test for schemas/hardwarevtep

Change-Id: I307b4e58c414e9b31a5a3f81f0f9d888d8c18727
Signed-off-by: Sam Hague <shague@redhat.com>

Add template unit test for schema/openvswitch

Change-Id: I3cf0536ad14f72eeeb43f2f51c0c1beb33aaceac
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Fix critical Sonar Issue: ConfigurationServiceImpl.java"

Fix critical Sonar Issue: ConfigurationServiceImpl.java

Fix for the following issue:
- Throwable.printStackTrace(...) should never be called

https://sonar.opendaylight.org/component/index#component=org.opendaylight.ovsdb%3Aplugin%3Amaster%3Asrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fplugin%2Fimpl%2FConfigurationServiceImpl.java&settings=issues&blocks=959%2C967&tab=issues&item=.js-filter-CRITICAL-issues&line=963

patch 2: replace 'e.fillInStackTrace()' with 'e'
patch 3: set log level to error

Change-Id: I91af7d1548b3c7563126ace9ad33a0f1b8877379
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Fix Critcal Sonar Issue: ConfigurationServiceImpl.java.

Fixes the following issues:
- Use a logger to log this exception.

https://sonar.opendaylight.org/component/index#component=org.opendaylight.ovsdb%3Aplugin%3Amaster%3Asrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fplugin%2Fimpl%2FConfigurationServiceImpl.java&settings=issues&blocks=959%2C967&tab=issues&item=.js-filter-CRITICAL-issues

Change-Id: I37465b04134122d932d48ea26655057bbf5ea3ca
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Fix Major Sonar Issues: SouthboundEvent.java.

Fixes the following issues:
- Removed semi-colon to fix empty statement error
- 12 Avoid using If/If else/For statements without curly braces

https://sonar.opendaylight.org/component#component=org.opendaylight.ovsdb:openstack.net-virt:master:src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundEvent.java

Change-Id: Ic3adee50ec4a3f6f0d48c3d8330cfde9654d423f
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Fix Major Sonar Issues: NorthboundEvent.java.

Fixes the following issues:
- 22 Avoid using If/If else/For statements without curly braces

https://sonar.opendaylight.org/component#component=org.opendaylight.ovsdb:openstack.net-virt:master:src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NorthboundEvent.java

Change-Id: I84271baabf37d732fbaf34869b4a60ba697789e8
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Fix Major Sonar Issues: LBaaSPoolHandler.java.

Fixes the following issues:
- 13 Avoid using If/If else/For statements without curly braces

https://sonar.opendaylight.org/component#component=org.opendaylight.ovsdb:openstack.net-virt:master:src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java

Change-Id: I7655947f05731f213a54fee2c39b00a0ae8c945a
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Fix Major & Minor Sonar Issues: LBaaSHandler.java.

Fixes the following issues:
- Comments should not be located at the end of lines of code
- 9 Avoid using If/If else/For statements without curly braces

https://sonar.opendaylight.org/component#component=org.opendaylight.ovsdb:openstack.net-virt:master:src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java

Change-Id: I30152177b433cc3de4034e174fd4a42641f81994
Signed-off-by: Marcus Koontz <marcus.g.koontz@intel.com>

Add log to indicate the schema version

Change-Id: Idd381fed334d5053f10287ed205b217dc7b594a9
Signed-off-by: Sam Hague <shague@redhat.com>

Make method names consistent

Change-Id: I4c410970cceb8cc6d2a78fafe6615cea6d1d4f5a
Signed-off-by: Sam Hague <shague@redhat.com>

Fix tests where schema version is not supported

Tests were failing on earlier ovs versions because the schema version did not support certain tables. In these cases a bridge was created and not deleted because only part of the test ran.

Add assumeTrue() around the schema version check to all tests with a problem schema version to allow the test to continue.

Change-Id: I752c52ed483c252a4564fd24d6353654fc209a33
Signed-off-by: Sam Hague <shague@redhat.com>

Use features-integration as base for ovsdb karaf distro

Change-Id: I9613abdabe8e33c62accceb6552a45573ac74012
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Remove unused schema code."

Merge changes Ibe8d0d9f,I31935e1e,I0f1f3bee

* changes:
  Add checkstyle to utils.mdsal-openflow
  Add checkstyle to utils.config
  Add checkstyle to plugin-shell

Merge changes I8fe016c2,I75842f8e

* changes:
  Add assumeTrue around hardware_vtep schema check
  Add README.txt file with details on how to use hardware_vtep schema

Add checkstyle to utils.mdsal-openflow

Change-Id: Ibe8d0d9fef466ce02a2e5988cc8e28a9d709e609
Signed-off-by: Sam Hague <shague@redhat.com>

Add checkstyle to utils.config

Change-Id: I31935e1ef583e3dd8d7465330f05db3db96532cb
Signed-off-by: Sam Hague <shague@redhat.com>

Add checkstyle to plugin-shell

Change-Id: I0f1f3bee18eb8b706ae0e04fc540cf1ad1523a35
Signed-off-by: Sam Hague <shague@redhat.com>

Remove unused schema code.

The existing integration tests in schema were adapted to pax-exam and moved to the integrationtest bundle.

Change-Id: Ie255d4b81410d0b0e128959d55332ab8a3d39917
Signed-off-by: Sam Hague <shague@redhat.com>

Add assumeTrue around hardware_vtep schema check

The images used in the jenkins jobs do not support hardware_vtep so this is needed to pass the test.

Change-Id: I8fe016c29613d0a520585d9419d63aa4887a3864
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Add pax-exam integration-tests for hardware_vtep"

Add README.txt file with details on how to use hardware_vtep schema

Change-Id: I75842f8e32fec9d8fbd8edea418c72725ea39544
Signed-off-by: Sam Hague <shague@redhat.com>

Add pax-exam integration-tests for hardware_vtep

Change-Id: Iaf68ff38b5dbe58cf06f75c2fc54f429c1eae9a8
Signed-off-by: Sam Hague <shague@redhat.com>

Merge "Add pax exam schema integration tests"

Add pax exam schema integration tests

Patch Set 4: Fix verify error

Patch Set 3: checkstyle fixes

Patch Set 2:
- Adapted old tests to use pax exam
- Fixed some issues in existing tests that were not correct. In most cases this would be cleaning up orphaned columns in tables.
- Added new tests to cover untested code
- Added monitoring code to all tests to test that integration
- Refactored some methods to be common

Patch Set 1: Early draft, not to be merged

Change-Id: Ieb301fb75e8857bf682237fa6486676ca170363d
Signed-off-by: Sam Hague <shague@redhat.com>

Fix for Sonar Issue(A catch statement should never catch throwable)

Signed-off-by: Bindya Narayan <bindya.narayan@intel.com>

Fix for Sonar "Avoid Catching Throwable" error.

This patch fixes the error caught by sonar by catching exception
and not throwing 'Throwable' in processGetTableSchema method which
seems to be redundant.

Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>

Fix Sonar issue: Utility classes should not have a public constructor

Fix name of artifact to be less generic.

Change-Id: Ib09fd1c49d2d666ef2d5f19bbe4f6971301a7d8d
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

Merge "Complete PrintCache unit-test"

Merge "Bug 2021 - NORMAL and CONTROLLER flows should not use hard coded strings"