Fixes for portal App Access tests

Issue-ID: PORTAL-782
Change-Id: I573f18e653bc008c4454775d80120fc891290fde
Signed-off-by: Brian Freeman <bf1936@att.com>

2 files changed, 58 insertions, 14 deletions

diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index b37ec4ec..c8ec2974 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -280,13 +280,57 @@ Health Distribution Test
 
 Portal Login Tests
     [Tags]    healthlogin
+    [Timeout]   120
     Run Portal Login Tests
 
 Portal Application Access Tests
     [Tags]    healthportalapp
-    [Timeout]    180
+    [Timeout]    900
     Run Portal Application Access Tests
 
+Portal SDC Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   cs0008   demo123456!   gridster-SDC-icon-link   tabframe-SDC    Welcome to SDC
+    Close All Browsers
+
+Portal VID Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-Virtual-Infrastructure-Deployment-icon-link   tabframe-Virtual-Infrastructure-Deployment    Welcome to VID
+    Close All Browsers
+
+Portal A&AI UI Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-A&AI-UI-icon-link   tabframe-A&AI-UI    A&AI
+    Close All Browsers
+
+Portal Policy Editor Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-Policy-icon-link   tabframe-Policy    Policy Editor
+    Close All Browsers
+
+Portal SO Monitoring Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-SO-Monitoring-icon-link   tabframe-SO-Monitoring   SO
+    Close All Browsers
+
+Portal xDemo APP Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-xDemo-App-icon-link   tabframe-xDemo-App   xDemo
+    Close All Browsers
+
+Portal CLI Application Access Test
+    [Tags]    healthportalapp2
+    [Timeout]    180
+    Run Portal Application Login Test   demo    demo123456!  gridster-CLI-icon-link   tabframe-CLI   CLI
+    Close All Browsers
+
+
 Basic Holmes Rule Management API Health Check
     [Tags]    health    medium   health-dcaegen2
     Run Holmes Rule Mgmt Healthcheck
diff --git a/robot/testsuites/portalApp.robot b/robot/testsuites/portalApp.robot
index 0301ca4f..f62719ef 100644
--- a/robot/testsuites/portalApp.robot
+++ b/robot/testsuites/portalApp.robot
@@ -9,29 +9,29 @@ Suite Teardown  Close All Browsers
 *** Test Cases ***
 
 Login into Portal URL
-    [TAGS]  portal
+    [TAGS]  portal    portal-ci
     Portal admin Login To Portal GUI
 
 Portal Change REST URL Of X-DemoApp
-    [TAGS]  portal
+    [TAGS]  portal    portal-ci
     [Documentation]    Portal Change REST URL Of X-DemoApp
     Portal Change REST URL
 
 Portal R1 Release for AAF
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     [Documentation]    ONAP Portal R1 functionality for AAF test
     Portal AAF new fields
 
 EP Admin widget layout reset
-    [TAGS]  portalSKIP
+    [TAGS]  portalSKIP   portal-ci 
     Reset widget layout option
 
 Validate Functional Top Menu Get Access
-    [TAGS]  portal
+    [TAGS]  portal    portal-ci
     Functional Top Menu Get Access
 
 Validate Functional Top Menu Contact Us
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     Functional Top Menu Contact Us
 
 Edit Functional Menu
@@ -39,17 +39,17 @@ Edit Functional Menu
     Portal admin Edit Functional menu
 
 Create a Test user for Application Admin -Test
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     ${login_id}    ${email_address}=    Generate Random User    portal
     Portal admin Add Application admin User New user -Test    ${login_id}    ${email_address}
 
 Create a Test User for Application Admin
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     ${login_id}    ${email_address}=    Generate Random User    demoapp
     Portal admin Add Application admin User New user    ${login_id}    ${email_address}
 
 Add Application Admin for Existing User Test user
-    [TAGS]  portal
+    [TAGS]  portal   
     ${login_id}    ${email_address}=    Generate Random User    demoapp
     Portal admin Add Application Admin Existing User -APPDEMO    ${login_id}
 
@@ -69,23 +69,23 @@ Delete Application Admin for Existing User
     Portal admin Delete Application Admin Existing User    ${login_id}
 
 Logout from Portal GUI as Portal Admin
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     Portal admin Logout from Portal GUI
 
 # Application Admin user Test cases
 
 Login To Portal GUI as APP Admin
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     ${login_id}    ${email_address}=    Generate Random User    demoapp
     Application admin Login To Portal GUI    ${login_id}
 
 Logout from Portal GUI as APP Admin
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     Application admin Logout from Portal GUI
 
 #Standard User Test cases
 
 Logout from Portal GUI as Standard User
-    [TAGS]  portal
+    [TAGS]  portal   portal-ci
     Standard User Logout from Portal GUI
     Close All Browsers