From aab276e679f221b37fc6be37e5dd0ffd72ffc406 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 23 May 2019 11:50:16 -0500 Subject: El Alto start with 2.1.14 Issue-ID: AAF-834 Change-Id: I35cb2c87889f8ed51527c4cd5cfa79789ccd20b0 Signed-off-by: Instrumental --- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/JU_ConfigDAOTest.java | Bin 0 -> 20 bytes auth/auth-cass/JU_LocateDAOTest.java | Bin 0 -> 56 bytes auth/auth-cass/JU_NsDAOTest.java | Bin 0 -> 28 bytes auth/auth-cass/JU_OAuthTokenDAOTest.java | Bin 0 -> 61 bytes auth/auth-cass/JU_PermDAOTest.java | Bin 0 -> 32 bytes auth/auth-cass/JU_RoleDAOTest.java | Bin 0 -> 24 bytes auth/auth-cass/JU_UserRoleDAOTest.java | Bin 0 -> 32 bytes auth/auth-cass/pom.xml | 2 +- .../java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java | 7 +++---- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/agent.sh | 2 +- auth/docker/d.props.init | 2 +- auth/helm/aaf/values.yaml | 2 +- auth/pom.xml | 2 +- 24 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 auth/auth-cass/JU_ConfigDAOTest.java create mode 100644 auth/auth-cass/JU_LocateDAOTest.java create mode 100644 auth/auth-cass/JU_NsDAOTest.java create mode 100644 auth/auth-cass/JU_OAuthTokenDAOTest.java create mode 100644 auth/auth-cass/JU_PermDAOTest.java create mode 100644 auth/auth-cass/JU_RoleDAOTest.java create mode 100644 auth/auth-cass/JU_UserRoleDAOTest.java (limited to 'auth') diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 04665358..442f6b63 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/JU_ConfigDAOTest.java b/auth/auth-cass/JU_ConfigDAOTest.java new file mode 100644 index 00000000..c355c4df Binary files /dev/null and b/auth/auth-cass/JU_ConfigDAOTest.java differ diff --git a/auth/auth-cass/JU_LocateDAOTest.java b/auth/auth-cass/JU_LocateDAOTest.java new file mode 100644 index 00000000..ad7b3a26 Binary files /dev/null and b/auth/auth-cass/JU_LocateDAOTest.java differ diff --git a/auth/auth-cass/JU_NsDAOTest.java b/auth/auth-cass/JU_NsDAOTest.java new file mode 100644 index 00000000..021329a5 Binary files /dev/null and b/auth/auth-cass/JU_NsDAOTest.java differ diff --git a/auth/auth-cass/JU_OAuthTokenDAOTest.java b/auth/auth-cass/JU_OAuthTokenDAOTest.java new file mode 100644 index 00000000..4ab86cdb Binary files /dev/null and b/auth/auth-cass/JU_OAuthTokenDAOTest.java differ diff --git a/auth/auth-cass/JU_PermDAOTest.java b/auth/auth-cass/JU_PermDAOTest.java new file mode 100644 index 00000000..74b7a02c Binary files /dev/null and b/auth/auth-cass/JU_PermDAOTest.java differ diff --git a/auth/auth-cass/JU_RoleDAOTest.java b/auth/auth-cass/JU_RoleDAOTest.java new file mode 100644 index 00000000..06a8e6c9 Binary files /dev/null and b/auth/auth-cass/JU_RoleDAOTest.java differ diff --git a/auth/auth-cass/JU_UserRoleDAOTest.java b/auth/auth-cass/JU_UserRoleDAOTest.java new file mode 100644 index 00000000..56d5b8a4 Binary files /dev/null and b/auth/auth-cass/JU_UserRoleDAOTest.java differ diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 2cedf0d3..ee000395 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java b/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java index ce32615d..fbd1b813 100644 --- a/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java +++ b/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java @@ -269,13 +269,12 @@ public class JU_CacheInfoDAO { CacheInfoDAOImpl daoObj=null; try { daoObj = new CacheInfoDAOImpl(trans, cluster, "test",data, createPS); + Date retVal = daoObj.get(trans, "test", 1011); +// assertTrue(retVal.status == 0); + retVal = daoObj.get(trans, "test1", 1011); } catch (APIException | IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } - Date retVal = daoObj.get(trans, "test", 1011); -// assertTrue(retVal.status == 0); - retVal = daoObj.get(trans, "test1", 1011); } @Test diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index e0ab3a21..133a88d9 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index dfb49374..900bc427 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 5df349af..2b9297d2 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 0aff96e4..92e08fdf 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ authparent ../pom.xml org.onap.aaf.authz - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 602b8e45..7a561263 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 00465d15..dc8f7638 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 6bb56900..25a02bf3 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index f351a71e..baf69baf 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index b4de86d2..ec5e915d 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 1e89114e..3b34b692 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT ../pom.xml diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index feb19303..0538b70d 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -28,7 +28,7 @@ fi . ./aaf.props DOCKER=${DOCKER:=docker} -CADI_VERSION=${CADI_VERSION:=2.1.13-SNAPSHOT} +CADI_VERSION=${CADI_VERSION:=2.1.14-SNAPSHOT} for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do if [ "$(grep $V ./aaf.props)" = "" ]; then diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 66663bfd..d1293874 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -23,7 +23,7 @@ PROJECT=aaf # Note: Override can happen on dbuild.sh Commandline, -r DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.13-SNAPSHOT +VERSION=2.1.14-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index 61665a2d..4ae0777e 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -114,7 +114,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.13-SNAPSHOT + version: 2.1.14 resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/auth/pom.xml b/auth/pom.xml index c3e7c2b5..36fe6036 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.13-SNAPSHOT + 2.1.14-SNAPSHOT authparent AAF Auth Parent -- cgit 1.2.3-korg