Merge branch 'dev'

BUGFIX for ticket #263

Source/Python/Mods/checks.py

@@ -478,12 +478,17 @@ def check_queue(queue, gateway, destination, ecuid, ecgid):
 
     '''
     if queue in _config.QUEUES_LIST and \
-            (not gateway or not destination or
-             not ecuid or not ecgid):
-        raise ValueError('\nEnvironment variables GATEWAY, DESTINATION, ECUID '
+            (not ecuid or not ecgid):
+        raise ValueError('\nEnvironment variables ECUID '
                          'and ECGID were not set properly! \n '
                          'Please check for existence of file "ECMWF_ENV" '
                          'in the run directory!')
+    elif queue in _config.QUEUES_LIST and \
+             (not gateway or not destination):
+        print('WARNING: Parameters GATEWAY and DESTINATION were '
+              'not properly set for working on ECMWF server. \n'
+              'There will be no transfer of output files to the '
+              'local gateway server possible!')
     return
 
 def check_pathes(idir, odir, fpdir, fedir):

Source/Python/install.py

@@ -284,19 +284,19 @@ def check_install_conditions(c):
         sys.exit(1)
 
     if c.install_target and c.install_target != 'local':
-        if not c.ecgid or not c.ecuid or \
-           not c.gateway or not c.destination:
-            print('Please enter your ECMWF user id and group id as well ' +
-                  'as the \nname of the local gateway and the ectrans ' +
-                  'destination ')
-            print('with command line options --ecuid --ecgid \
-                   --gateway --destination')
+        if not c.ecgid or not c.ecuid:
+            print('Please enter your ECMWF user id and group id '
+                  ' with command line options --ecuid --ecgid')
             print('Try "' + sys.argv[0].split('/')[-1] + \
                   ' -h" to print usage information')
-            print('Please consult ecaccess documentation or ECMWF user \
-                   support for further details')
+            print('Please consult ecaccess documentation or ECMWF user '
+                  'support for further details.\n')
             sys.exit(1)
-
+        if not c.gateway or not c.destination:
+            print('WARNING: Parameters GATEWAY and DESTINATION were '
+                  'not properly set for working on ECMWF server. \n'
+                  'There will be no transfer of output files to the '
+                  'local gateway server possible!')
         if not c.installdir:
             c.installdir = '${HOME}'
     else: # local

setup.sh

@@ -30,7 +30,7 @@ MAKEFILE='makefile_ecgate'
 ECUID='<username>'
 ECGID='<groupID>'
 GATEWAY='<gatewayname>'
-DESTINATION='<name>@genericSftp'
+DESTINATION='<username>@genericSftp'
 INSTALLDIR=None
 JOB_TEMPLATE=''
 CONTROLFILE='CONTROL_EA5'
@@ -58,13 +58,16 @@ fi
 # CHECK FOR MORE PARAMETER 
 if [ "$TARGET" == "ecgate" ] || [ "$TARGET" == "cca" ]; then
   # check if necessary Parameters are set
-  if [ -z "$ECUID" ] || [ -z "$ECGID" ] || [ -z "$GATEWAY" ] || [ -z "$DESTINATION" ]; then
-    echo "ERROR: At least one of the following parameters are not set: ECUID, ECGID, GATEWAY, DESTINATION!"
+  if [ -z "$ECUID" ] || [ -z "$ECGID" ] || [ "$ECUID" == "<username>" ] || [ "$ECGID" == "<groupID>" ] ; then
+    echo "ERROR: At least one of the following parameters are not properly set: ECUID or ECGID!"
     echo "EXIT WITH ERROR"
     exit
   else
     parameterlist+=" --ecuid=$ECUID --ecgid=$ECGID --gateway=$GATEWAY --destination=$DESTINATION"
   fi
+  if [ -z "$GATEWAY" ] || [ -z "$DESTINATION" ] || [ "$GATEWAY" == "<gatewayname>" ] || [ "$DESTINATION" == "<username>@genericSftp" ] ; then
+    echo "WARNING: Not setting parameters GATEWAY and DESTINATION means there will be no file transfer to local gateway server."
+  fi
 fi
 if [ -n "$MAKEFILE" ]; then
   parameterlist+=" --makefile=$MAKEFILE"