SW-811: Merge branch 'LOFAR-Release-4_0' of git.astron.nl:ro/lofar into LOFAR-Release-4_0

LTA/ltastorageoverview/lib/webservice/webservice.py

@@ -225,20 +225,19 @@ def main():
 
     # Check the invocation arguments
     parser = OptionParser("%prog [options]", description='runs the lta scraper and stores results in the speficied database.')
-    parser.add_option('-V', '--verbose', dest='verbose', action='store_true', help='verbose logging')
     parser.add_option_group(dbcredentials.options_group(parser))
     parser.set_defaults(dbcredentials="LTASO")
     (options, args) = parser.parse_args()
 
     logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s',
-                        level=logging.DEBUG if options.verbose else logging.INFO)
+                        level=logging.INFO)
 
     dbcreds = dbcredentials.parse_options(options)
 
     logger.info("Using dbcreds: %s" % dbcreds.stringWithHiddenPassword())
 
     global db
-    db = store.LTAStorageDb(dbcreds, options.verbose)
+    db = store.LTAStorageDb(dbcreds)
 
     app.run(debug=False,host='0.0.0.0',port=9632)
 

SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/create_add_virtual_instrument.sql.py

@@ -205,7 +205,7 @@ with open("add_virtual_instrument.sql", 'w+') as output:
   'CS021', 'CS024', 'CS026', 'CS028', 'CS030', 'CS031', 'CS032', 'CS101', 'CS103', 'CS201', 'CS301',
   'CS302', 'CS401', 'CS501', 'RS106', 'RS205', 'RS208', 'RS210', 'RS305', 'RS306', 'RS307', 'RS310', 'RS406',
   'RS407', 'RS408', 'RS409', 'RS503', 'RS508', 'RS509', 'DE601', 'DE602', 'DE603', 'DE604', 'DE605', 'FR606',
-  'SE607', 'UK608','DE609','PL610','PL611','PL612','IE613','IS614','TEST1']
+  'SE607', 'UK608','DE609','PL610','PL611','PL612','IE613','LV614','TEST1']
   num_stations = 54
   num_nl_stations = 39
   assert len(stations) == num_stations