Fix userName property for http clients

The http client property files had "username", but the correct
property name is "userName".  Fixed.
Also updated the models version to the latest snapshot to pick
up the fix to the APPC actor.

Issue-ID: POLICY-2441
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I4d64efcb5b639526beb145ee0231c6d650098d0f

7 files changed, 9 insertions, 9 deletions

diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties
index afc8772f9..1e3e88cec 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties
+++ b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-http-client.properties
@@ -23,7 +23,7 @@ http.client.services=GUARD,AAI,SDNC,SO,VFC
 http.client.services.GUARD.managed=true
 http.client.services.GUARD.host=localhost
 http.client.services.GUARD.port=6669
-http.client.services.GUARD.username=pdpx
+http.client.services.GUARD.userName=pdpx
 http.client.services.GUARD.password=pdpx
 http.client.services.GUARD.contextUriPath=policy/pdpx/v1/
 
@@ -35,7 +35,7 @@ http.client.services.AAI.contextUriPath=
 http.client.services.SDNC.managed=true
 http.client.services.SDNC.host=localhost
 http.client.services.SDNC.port=6665
-http.client.services.SDNC.username=sdnc
+http.client.services.SDNC.userName=sdnc
 http.client.services.SDNC.password=sdnc
 http.client.services.SDNC.contextUriPath=
 
@@ -47,6 +47,6 @@ http.client.services.SO.contextUriPath=
 http.client.services.VFC.managed=true
 http.client.services.VFC.host=localhost
 http.client.services.VFC.port=6668
-http.client.services.VFC.username=VFC
+http.client.services.VFC.userName=VFC
 http.client.services.VFC.password=VFC
 http.client.services.VFC.contextUriPath=api/nslcm/v1
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
index 2eb76007c..774bbadb3 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/AAI-http-client.properties
@@ -22,6 +22,6 @@ http.client.services.AAI.managed=true
 http.client.services.AAI.https=true
 http.client.services.AAI.host=${envd:AAI_HOST}
 http.client.services.AAI.port=${envd:AAI_PORT}
-http.client.services.AAI.username=${envd:AAI_USERNAME}
+http.client.services.AAI.userName=${envd:AAI_USERNAME}
 http.client.services.AAI.password=${envd:AAI_PASSWORD}
 http.client.services.AAI.contextUriPath=${envd:AAI_CONTEXT_URI}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
index 8772f906e..b0d88b483 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/GUARD-http-client.properties
@@ -22,6 +22,6 @@ http.client.services.GUARD.managed=true
 http.client.services.GUARD.https=true
 http.client.services.GUARD.host=${envd:PDP_HOST}
 http.client.services.GUARD.port=${envd:PDP_PORT}
-http.client.services.GUARD.username=${envd:PDP_USERNAME}
+http.client.services.GUARD.userName=${envd:PDP_USERNAME}
 http.client.services.GUARD.password=${envd:PDP_PASSWORD}
 http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1/}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
index 255a32103..1a8990b4d 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNC-http-client.properties
@@ -22,6 +22,6 @@ http.client.services.SDNC.managed=true
 http.client.services.SDNC.https=true
 http.client.services.SDNC.host=${envd:SDNC_HOST}
 http.client.services.SDNC.port=${envd:SDNC_PORT}
-http.client.services.SDNC.username=${envd:SDNC_USERNAME}
+http.client.services.SDNC.userName=${envd:SDNC_USERNAME}
 http.client.services.SDNC.password=${envd:SDNC_PASSWORD}
 http.client.services.SDNC.contextUriPath=${envd:SDNC_CONTEXT_URI}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
index 65e1b4ff6..9e32aac32 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SO-http-client.properties
@@ -22,6 +22,6 @@ http.client.services.SO.managed=true
 http.client.services.SO.https=true
 http.client.services.SO.host=${envd:SO_HOST}
 http.client.services.SO.port=${envd:SO_PORT}
-http.client.services.SO.username=${envd:SO_USERNAME}
+http.client.services.SO.userName=${envd:SO_USERNAME}
 http.client.services.SO.password=${envd:SO_PASSWORD}
 http.client.services.SO.contextUriPath=${envd:SO_CONTEXT_URI}
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
index b4bc9427d..a781ed2d1 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/VFC-http-client.properties
@@ -22,6 +22,6 @@ http.client.services.VFC.managed=true
 http.client.services.VFC.https=true
 http.client.services.VFC.host=${envd:VFC_HOST}
 http.client.services.VFC.port=${envd:VFC_PORT}
-http.client.services.VFC.username=${envd:VFC_USERNAME}
+http.client.services.VFC.userName=${envd:VFC_USERNAME}
 http.client.services.VFC.password=${envd:VFC_PASSWORD}
 http.client.services.VFC.contextUriPath=${envd:VFC_CONTEXT_URI:api/nslcm/v1/}
diff --git a/pom.xml b/pom.xml
index 61f770c93..49711a84e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 
         <!-- Project common dependency versions -->
         <version.policy.common>1.6.2</version.policy.common>
-        <policy.models.version>2.2.2</policy.models.version>
+        <policy.models.version>2.2.3-SNAPSHOT</policy.models.version>
         <version.policy.drools-pdp>1.6.1-SNAPSHOT</version.policy.drools-pdp>
     </properties>