[common][geodeny][change path for supporting global user and add askpolicy.sh]

- add file askpolicy.sh
- change path for supporting global user in inst.wgt.py
- add askpolicy.sh to suite.json

Change-Id: Id31a64f1a4c276e0bcc7daefab2b36e6ac7cbb20
Signed-off-by: wei.ji <wei.ji@samsung.com>

diff --git a/common/tct-geodeny-w3c-tests/askpolicy.sh b/common/tct-geodeny-w3c-tests/askpolicy.sh
new file mode 100755 (executable)
index 0000000..1c39bdd
--- /dev/null
+++ b/common/tct-geodeny-w3c-tests/askpolicy.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+for i in `grep -r "0xA" /var/cynara/db/_ | grep $1`
+do
+    CLIENT=`echo $i | cut -d ";" -f1`
+    USER=`echo $i | cut -d ";" -f2`
+    PRIVILEGE=`echo $i | cut -d ";" -f3`
+    #echo "cyad --erase=\"\" -r=no -c $CLIENT -u $USER -p $PRIVILEGE"
+    cyad --erase="" -r=no -c $CLIENT -u $USER -p $PRIVILEGE
+done

diff --git a/common/tct-geodeny-w3c-tests/inst.wgt.py b/common/tct-geodeny-w3c-tests/inst.wgt.py
index 5b1718da169ebc796a16962b47a209f160af24d9..d4fcbeb70aa7e9c2766b367bd41b364a2166fa11 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/inst.wgt.py
+++ b/common/tct-geodeny-w3c-tests/inst.wgt.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 import string
-from optparse import OptionParser, make_option\r
+from optparse import OptionParser, make_option
 import ConfigParser
 
 
@@ -20,8 +20,33 @@ tct_parser = ConfigParser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')
+
+def userCheck():
+    global GLOVAL_OPT
+    if ADMIN_USER_30 == EXECUTION_MODE_30:
+        GLOVAL_OPT="--global"
+    else:
+        GLOVAL_OPT=""
 
 
+def askpolicyremoving():
+    for root, dirs, files in os.walk(SCRIPT_DIR):
+        for file in files:
+            if file.endswith(".wgt"):
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
+   
+    print pkg_id
+    print (os.getcwd())
+    print (os.path.dirname(os.path.realpath(__file__)) )
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):
+        action_status = False
+    if PARAMETERS.mode == "SDB":
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, 
+        SRC_DIR, pkg_id)
+    return doCMD(cmd)
+       
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
     print "-->> \"%s\"" % cmd
@@ -55,8 +80,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -116,7 +139,7 @@ def uninstPKGs():
                     action_status = False
                     continue
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
                 for line in output:
                     if "Failure" in line:
                         action_status = False
@@ -145,7 +168,7 @@ def instPKGs():
                 if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
                     action_status = False
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))
                 doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
                 for line in output:
                     if "Failure" in line:
@@ -187,7 +210,7 @@ def main():
         sys.exit(1)
 
     if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
+        PARAMETERS.user = EXECUTION_MODE_30
     if not PARAMETERS.mode:
         PARAMETERS.mode = "SDB"
 
@@ -204,7 +227,9 @@ def main():
     if not PARAMETERS.device:
         print "No device provided"
         sys.exit(1)
-
+    
+    userCheck()
+    
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :
@@ -223,6 +248,7 @@ def main():
             sys.exit(1)
     else:
         if not instPKGs():
+            #askpolicyremoving()
             sys.exit(1)
 
 if __name__ == "__main__":

diff --git a/common/tct-geodeny-w3c-tests/suite.json b/common/tct-geodeny-w3c-tests/suite.json
index 7c52beb80c0df9c349bbb1db63b7a82808645107..ec2d68cd31e820df9400bbc6edab42c6578372e0 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/suite.json
+++ b/common/tct-geodeny-w3c-tests/suite.json
@@ -33,6 +33,7 @@
             ],
             "copylist": {
                 "inst.wgt.py": "inst.py",
+                "askpolicy.sh": "askpolicy.sh",
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },