Changes in / [b0ecdb2:f127aee] in flex_extract.git

Files:

• Source/Python/Mods/checks.py (modified) (1 diff)
• Source/Python/install.py (modified) (1 diff)
• setup.sh (modified) (2 diffs)

Source/Python/Mods/checks.py

@@ -479 +479 @@
     '''
     if queue in _config.QUEUES_LIST and \
-            (not ecuid or not ecgid):
-        raise ValueError('\nEnvironment variables ECUID '
+            (not gateway or not destination or
+             not ecuid or not ecgid):
+        raise ValueError('\nEnvironment variables GATEWAY, DESTINATION, 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
 

Source/Python/install.py

@@ -285 +285 @@
 
     if c.install_target and c.install_target != 'local':
-        if not c.ecgid or not c.ecuid:
-            print('Please enter your ECMWF user id and group id '
-                  ' with command line options --ecuid --ecgid')
+        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')
             print('Try "' + sys.argv[0].split('/')[-1] + \
                   ' -h" to print usage information')
-            print('Please consult ecaccess documentation or ECMWF user '
-                  'support for further details.\n')
+            print('Please consult ecaccess documentation or ECMWF user \
+                   support for further details')
             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}'

setup.sh

@@ -31 +31 @@
 ECGID='<groupID>'
 GATEWAY='<gatewayname>'
-DESTINATION='<username>@genericSftp'
+DESTINATION='<name>@genericSftp'
 INSTALLDIR=None
 JOB_TEMPLATE=''
@@ -59 +59 @@
 if [ "$TARGET" == "ecgate" ] || [ "$TARGET" == "cca" ]; then
   # check if necessary Parameters are set
-  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!"
+  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!"
     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