diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py index adba4316ac..66b19b3d00 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/__init__.py @@ -2,7 +2,6 @@ # File auto-generated by PythonFileGenerator __all__ = [ - 'atcf', 'gempak', 'gpd', 'pgen' diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py index 6393c6087e..839d5fbfee 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridDataRequest.py @@ -1,59 +1,17 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetGridDataRequest(object): def __init__(self): - self.vcoord = None - self.level2 = None - self.modelId = None - self.parm = None - self.level1 = None - self.reftime = None self.pluginName = None + self.modelId = None + self.reftime = None self.fcstsec = None - - def getVcoord(self): - return self.vcoord - - def setVcoord(self, vcoord): - self.vcoord = vcoord - - def getLevel2(self): - return self.level2 - - def setLevel2(self, level2): - self.level2 = level2 - - def getModelId(self): - return self.modelId - - def setModelId(self, modelId): - self.modelId = modelId - - def getParm(self): - return self.parm - - def setParm(self, parm): - self.parm = parm - - def getLevel1(self): - return self.level1 - - def setLevel1(self, level1): - self.level1 = level1 - - def getReftime(self): - return self.reftime - - def setReftime(self, reftime): - self.reftime = reftime + self.level1 = None + self.level2 = None + self.vcoord = None + self.parm = None def getPluginName(self): return self.pluginName @@ -61,9 +19,44 @@ class GetGridDataRequest(object): def setPluginName(self, pluginName): self.pluginName = pluginName + def getModelId(self): + return self.modelId + + def setModelId(self, modelId): + self.modelId = modelId + + def getReftime(self): + return self.reftime + + def setReftime(self, reftime): + self.reftime = reftime + def getFcstsec(self): return self.fcstsec - def setFcstsec(self, fcstsec): + def setFcstSec(self, fcstsec): self.fcstsec = fcstsec + def getLevel1(self): + return self.level1 + + def setLevel1(self, level1): + self.level1 = level1 + + def getLevel2(self): + return self.level2 + + def setLevel2(self, level2): + self.level2 = level2 + + def getVcoord(self): + return self.vcoord + + def setVcoord(self, vcoord): + self.vcoord = vcoord + + def getParm(self): + return self.parm + + def setParm(self, parm): + self.parm = parm diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py index 2c2c02c483..760b710d91 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridInfoRequest.py @@ -1,31 +1,11 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetGridInfoRequest(object): def __init__(self): - self.modelId = None - self.reftime = None self.pluginName = None - self.fcstsec = None - - def getModelId(self): - return self.modelId - - def setModelId(self, modelId): - self.modelId = modelId - - def getReftime(self): - return self.reftime - - def setReftime(self, reftime): - self.reftime = reftime + self.modelId = None def getPluginName(self): return self.pluginName @@ -33,9 +13,9 @@ class GetGridInfoRequest(object): def setPluginName(self, pluginName): self.pluginName = pluginName - def getFcstsec(self): - return self.fcstsec + def getModelId(self): + return self.modelId - def setFcstsec(self, fcstsec): - self.fcstsec = fcstsec + def setModelId(self, modelId): + self.modelId = modelId diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py index dd2afca8c4..c86032f934 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetGridNavRequest.py @@ -1,23 +1,11 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetGridNavRequest(object): def __init__(self): - self.modelId = None self.pluginName = None - - def getModelId(self): - return self.modelId - - def setModelId(self, modelId): - self.modelId = modelId + self.modelId = None def getPluginName(self): return self.pluginName @@ -25,3 +13,9 @@ class GetGridNavRequest(object): def setPluginName(self, pluginName): self.pluginName = pluginName + def getModelId(self): + return self.modelId + + def setModelId(self, modelId): + self.modelId = modelId + diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py index 2f589613bd..57ef8c404c 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetStationsRequest.py @@ -1,11 +1,5 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetStationsRequest(object): @@ -17,4 +11,3 @@ class GetStationsRequest(object): def setPluginName(self, pluginName): self.pluginName = pluginName - diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py index f766896986..0c50bbcc70 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesRequest.py @@ -1,11 +1,5 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetTimesRequest(object): diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py index 6864f0c249..439a1ef0d6 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/GetTimesResponse.py @@ -1,11 +1,5 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class GetTimesResponse(object): diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py index a530b7612b..971dcbf478 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/Station.py @@ -1,36 +1,16 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated - -import numpy class Station(object): def __init__(self): - self.elevation = None - self.state = None self.stationId = None - self.longitude = None - self.latitude = None self.wmoIndex = None + self.elevation = None self.country = None - - def getElevation(self): - return self.elevation - - def setElevation(self, elevation): - self.elevation = elevation - - def getState(self): - return self.state - - def setState(self, state): - self.state = state + self.state = None + self.latitude = None + self.longitude = None def getStationId(self): return self.stationId @@ -38,27 +18,39 @@ class Station(object): def setStationId(self, stationId): self.stationId = stationId - def getLongitude(self): - return self.longitude - - def setLongitude(self, longitude): - self.longitude = numpy.float64(longitude) - - def getLatitude(self): - return self.latitude - - def setLatitude(self, latitude): - self.latitude = numpy.float64(latitude) - def getWmoIndex(self): return self.wmoIndex def setWmoIndex(self, wmoIndex): self.wmoIndex = wmoIndex + def getElevation(self): + return self.elevation + + def setElevation(self, elevation): + self.elevation = elevation + def getCountry(self): return self.country def setCountry(self, country): self.country = country + def getState(self): + return self.state + + def setState(self, state): + self.state = state + + def getLatitude(self): + return self.latitude + + def setLatitude(self, latitude): + self.latitude = latitude + + def getLongitude(self): + return self.longitude + + def setLongitude(self, longitude): + self.longitude = longitude + diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py index cb9a467d42..f428ded055 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/StationDataRequest.py @@ -1,45 +1,39 @@ # File auto-generated against equivalent DynamicSerialize Java class -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 16, 2016 pmoyer Generated class StationDataRequest(object): def __init__(self): - self.refTime = None self.pluginName = None - self.parmList = None self.stationId = None + self.refTime = None + self.parmList = None self.partNumber = None - def getRefTime(self): - return self.refTime - - def setRefTime(self, refTime): - self.refTime = refTime - def getPluginName(self): return self.pluginName def setPluginName(self, pluginName): self.pluginName = pluginName - def getParmList(self): - return self.parmList - - def setParmList(self, parmList): - self.parmList = parmList - def getStationId(self): return self.stationId def setStationId(self, stationId): self.stationId = stationId + def getRefTime(self): + return self.refTime + + def setRefTime(self, refTime): + self.refTime = refTime + + def getParmList(self): + return self.parmList + + def setParmList(self, parmList): + self.parmList = parmList + def getPartNumber(self): return self.partNumber diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py index 9ef0c44022..615510b1ab 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gempak/request/__init__.py @@ -2,26 +2,21 @@ # File auto-generated by PythonFileGenerator __all__ = [ - 'GetGridDataRequest', - 'GetGridInfoRequest', - 'GetGridNavRequest', - 'GetStationsRequest', 'GetTimesRequest', + 'GetStationsRequest', 'GetTimesResponse', 'Station', 'StationDataRequest', - 'SurfaceDataRequest', - 'UpperAirDataRequest' + 'GetGridDataRequest', + 'GetGridInfoRequest', + 'GetGridNavRequest' ] -from GetGridDataRequest import GetGridDataRequest -from GetGridInfoRequest import GetGridInfoRequest -from GetGridNavRequest import GetGridNavRequest -from GetStationsRequest import GetStationsRequest from GetTimesRequest import GetTimesRequest +from GetStationsRequest import GetStationsRequest from GetTimesResponse import GetTimesResponse from Station import Station from StationDataRequest import StationDataRequest -from SurfaceDataRequest import SurfaceDataRequest -from UpperAirDataRequest import UpperAirDataRequest - +from GetGridDataRequest import GetGridDataRequest +from GetGridInfoRequest import GetGridInfoRequest +from GetGridNavRequest import GetGridNavRequest diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py index bf01e4562c..479ce8ac28 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py @@ -5,8 +5,7 @@ __all__ = [ 'ActivityInfo', 'DerivedProduct', 'ResponseMessageValidate', - 'request', - 'response' + 'request' ] from ActivityInfo import ActivityInfo diff --git a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py index cecb082c9a..c5c872b7a9 100644 --- a/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py +++ b/pythonPackages/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py @@ -4,12 +4,10 @@ __all__ = [ 'RetrieveAllProductsRequest', 'StoreActivityRequest', - 'StoreDerivedProductRequest', - 'RetrieveActivityMapRequest' + 'StoreDerivedProductRequest' ] from RetrieveAllProductsRequest import RetrieveAllProductsRequest from StoreActivityRequest import StoreActivityRequest from StoreDerivedProductRequest import StoreDerivedProductRequest -from RetrieveActivityMapRequest import RetrieveActivityMapRequest diff --git a/pythonPackages/ufpy/test/Test b/pythonPackages/ufpy/test/Test index 00d71d449b..4ff1a0ba84 100644 --- a/pythonPackages/ufpy/test/Test +++ b/pythonPackages/ufpy/test/Test @@ -39,7 +39,7 @@ import os import logging -from awips import AlertVizHandler +from ufpy import AlertVizHandler import Record avh = AlertVizHandler.AlertVizHandler(host=os.getenv("BROKER_ADDR","localhost"), port=9581, category='LOCAL', source='ANNOUNCER', level=logging.NOTSET) diff --git a/pythonPackages/ufpy/test/__init__.py b/pythonPackages/ufpy/test/__init__.py index 65dffe03c5..ae5228cd62 100644 --- a/pythonPackages/ufpy/test/__init__.py +++ b/pythonPackages/ufpy/test/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for awips package +# __init__.py for ufpy package # # # SOFTWARE HISTORY diff --git a/pythonPackages/ufpy/test/dafTests/__init__.py b/pythonPackages/ufpy/test/dafTests/__init__.py index 6041dc1ad1..5ce6ada4e0 100644 --- a/pythonPackages/ufpy/test/dafTests/__init__.py +++ b/pythonPackages/ufpy/test/dafTests/__init__.py @@ -20,7 +20,7 @@ # -# __init__.py for awips.test.dafTests package +# __init__.py for ufpy.test.dafTests package # # # SOFTWARE HISTORY diff --git a/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py b/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py index 652d838963..86ed33fbff 100644 --- a/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py +++ b/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py @@ -18,7 +18,7 @@ # further licensing information. ## -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py b/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py index 9275082083..1a66ab4c32 100644 --- a/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py +++ b/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py @@ -20,8 +20,8 @@ from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import os import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testAcars.py b/pythonPackages/ufpy/test/dafTests/testAcars.py index 9ab9167e88..b43cb3f35d 100644 --- a/pythonPackages/ufpy/test/dafTests/testAcars.py +++ b/pythonPackages/ufpy/test/dafTests/testAcars.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testAirep.py b/pythonPackages/ufpy/test/dafTests/testAirep.py index 9d9fc96524..a4fc5fd98f 100644 --- a/pythonPackages/ufpy/test/dafTests/testAirep.py +++ b/pythonPackages/ufpy/test/dafTests/testAirep.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testBinLightning.py b/pythonPackages/ufpy/test/dafTests/testBinLightning.py index da273eb09e..468a6b13be 100644 --- a/pythonPackages/ufpy/test/dafTests/testBinLightning.py +++ b/pythonPackages/ufpy/test/dafTests/testBinLightning.py @@ -19,8 +19,8 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py b/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py index e1ab295a67..bb986f178d 100644 --- a/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py +++ b/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseBufrMosTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py b/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py index 27d1b0f827..0995ab9959 100644 --- a/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py +++ b/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseBufrMosTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testBufrUa.py b/pythonPackages/ufpy/test/dafTests/testBufrUa.py index 42bfc0518a..bca4a9c4d4 100644 --- a/pythonPackages/ufpy/test/dafTests/testBufrUa.py +++ b/pythonPackages/ufpy/test/dafTests/testBufrUa.py @@ -19,7 +19,7 @@ # # from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testClimate.py b/pythonPackages/ufpy/test/dafTests/testClimate.py index 6bb98ab7f6..0064601f96 100644 --- a/pythonPackages/ufpy/test/dafTests/testClimate.py +++ b/pythonPackages/ufpy/test/dafTests/testClimate.py @@ -22,8 +22,8 @@ from __future__ import print_function import datetime from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testCombinedTimeQuery.py b/pythonPackages/ufpy/test/dafTests/testCombinedTimeQuery.py index 429edc3124..92a9750c2e 100644 --- a/pythonPackages/ufpy/test/dafTests/testCombinedTimeQuery.py +++ b/pythonPackages/ufpy/test/dafTests/testCombinedTimeQuery.py @@ -18,9 +18,9 @@ # further licensing information. ## -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL -from awips.dataaccess import CombinedTimeQuery as CTQ +from ufpy.dataaccess import CombinedTimeQuery as CTQ import unittest import os @@ -49,7 +49,7 @@ class CombinedTimeQueryTestCase(unittest.TestCase): def testSuccessfulQuery(self): req = DAL.newDataRequest('grid') - req.setLocationNames('RAP13') + req.setLocationNames('RUC130') req.setParameters('T','GH') req.setLevels('300MB', '500MB','700MB') times = CTQ.getAvailableTimes(req); @@ -60,7 +60,7 @@ class CombinedTimeQueryTestCase(unittest.TestCase): Test that when a parameter is only available on one of the levels that no times are returned. """ req = DAL.newDataRequest('grid') - req.setLocationNames('RAP13') + req.setLocationNames('RUC130') req.setParameters('T','GH', 'LgSP1hr') req.setLevels('300MB', '500MB','700MB','0.0SFC') times = CTQ.getAvailableTimes(req); diff --git a/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py b/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py index 8a3e18dd4e..15327606f9 100644 --- a/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py +++ b/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py @@ -20,7 +20,7 @@ from __future__ import print_function from shapely.geometry import box -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testFfmp.py b/pythonPackages/ufpy/test/dafTests/testFfmp.py index 5fa7d93919..10a3cc0f88 100644 --- a/pythonPackages/ufpy/test/dafTests/testFfmp.py +++ b/pythonPackages/ufpy/test/dafTests/testFfmp.py @@ -20,7 +20,7 @@ from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testGfe.py b/pythonPackages/ufpy/test/dafTests/testGfe.py index f5bdbebd85..30987832bf 100644 --- a/pythonPackages/ufpy/test/dafTests/testGfe.py +++ b/pythonPackages/ufpy/test/dafTests/testGfe.py @@ -20,7 +20,7 @@ from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testGrid.py b/pythonPackages/ufpy/test/dafTests/testGrid.py index e20d2e5403..91c89d3ce8 100644 --- a/pythonPackages/ufpy/test/dafTests/testGrid.py +++ b/pythonPackages/ufpy/test/dafTests/testGrid.py @@ -21,8 +21,8 @@ from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from shapely.geometry import box, Point -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testHydro.py b/pythonPackages/ufpy/test/dafTests/testHydro.py index c49b8fd7bf..8f1accef88 100644 --- a/pythonPackages/ufpy/test/dafTests/testHydro.py +++ b/pythonPackages/ufpy/test/dafTests/testHydro.py @@ -20,8 +20,8 @@ from __future__ import print_function import datetime -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from dynamicserialize.dstypes.com.raytheon.uf.common.time import TimeRange diff --git a/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py b/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py index 5f6da0d268..38e3dd9cd0 100644 --- a/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py +++ b/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py @@ -20,7 +20,7 @@ from __future__ import print_function from shapely.geometry import Polygon -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testMaps.py b/pythonPackages/ufpy/test/dafTests/testMaps.py index 0b9f716be7..8289383fb8 100644 --- a/pythonPackages/ufpy/test/dafTests/testMaps.py +++ b/pythonPackages/ufpy/test/dafTests/testMaps.py @@ -20,8 +20,8 @@ from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testModelSounding.py b/pythonPackages/ufpy/test/dafTests/testModelSounding.py index ac8fb79832..8a4dea0698 100644 --- a/pythonPackages/ufpy/test/dafTests/testModelSounding.py +++ b/pythonPackages/ufpy/test/dafTests/testModelSounding.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testObs.py b/pythonPackages/ufpy/test/dafTests/testObs.py index bf97bda146..9fd5a5728f 100644 --- a/pythonPackages/ufpy/test/dafTests/testObs.py +++ b/pythonPackages/ufpy/test/dafTests/testObs.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testPirep.py b/pythonPackages/ufpy/test/dafTests/testPirep.py index 876a378a67..af33d7e28b 100644 --- a/pythonPackages/ufpy/test/dafTests/testPirep.py +++ b/pythonPackages/ufpy/test/dafTests/testPirep.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py b/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py index 90dee746db..2ee820cccf 100644 --- a/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py +++ b/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import testWarning diff --git a/pythonPackages/ufpy/test/dafTests/testProfiler.py b/pythonPackages/ufpy/test/dafTests/testProfiler.py index a05f6d9a8b..b249836748 100644 --- a/pythonPackages/ufpy/test/dafTests/testProfiler.py +++ b/pythonPackages/ufpy/test/dafTests/testProfiler.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testRadar.py b/pythonPackages/ufpy/test/dafTests/testRadar.py index 2fb73128b8..81a369ff67 100644 --- a/pythonPackages/ufpy/test/dafTests/testRadar.py +++ b/pythonPackages/ufpy/test/dafTests/testRadar.py @@ -21,8 +21,8 @@ from __future__ import print_function from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint from shapely.geometry import box -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import baseDafTestCase import unittest diff --git a/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py b/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py index 039b3d2e8f..c92582e4d3 100644 --- a/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py +++ b/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py @@ -20,7 +20,7 @@ from __future__ import print_function from shapely.geometry import box -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testSatellite.py b/pythonPackages/ufpy/test/dafTests/testSatellite.py index 900ab657ca..3e42b1d2aa 100644 --- a/pythonPackages/ufpy/test/dafTests/testSatellite.py +++ b/pythonPackages/ufpy/test/dafTests/testSatellite.py @@ -20,7 +20,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testSfcObs.py b/pythonPackages/ufpy/test/dafTests/testSfcObs.py index 95c92c5f0c..4387eadee7 100644 --- a/pythonPackages/ufpy/test/dafTests/testSfcObs.py +++ b/pythonPackages/ufpy/test/dafTests/testSfcObs.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/dafTests/testTopo.py b/pythonPackages/ufpy/test/dafTests/testTopo.py index 1ed41316be..6f16cb6072 100644 --- a/pythonPackages/ufpy/test/dafTests/testTopo.py +++ b/pythonPackages/ufpy/test/dafTests/testTopo.py @@ -19,8 +19,8 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL -from awips.ThriftClient import ThriftRequestException +from ufpy.dataaccess import DataAccessLayer as DAL +from ufpy.ThriftClient import ThriftRequestException import baseDafTestCase import shapely.geometry diff --git a/pythonPackages/ufpy/test/dafTests/testWarning.py b/pythonPackages/ufpy/test/dafTests/testWarning.py index fd0ef4e3cd..af39f064f4 100644 --- a/pythonPackages/ufpy/test/dafTests/testWarning.py +++ b/pythonPackages/ufpy/test/dafTests/testWarning.py @@ -19,7 +19,7 @@ ## from __future__ import print_function -from awips.dataaccess import DataAccessLayer as DAL +from ufpy.dataaccess import DataAccessLayer as DAL from dynamicserialize.dstypes.com.raytheon.uf.common.dataquery.requests import RequestConstraint import baseDafTestCase diff --git a/pythonPackages/ufpy/test/testQpidTimeToLive.py b/pythonPackages/ufpy/test/testQpidTimeToLive.py index d4fbc1b699..ce3f074703 100644 --- a/pythonPackages/ufpy/test/testQpidTimeToLive.py +++ b/pythonPackages/ufpy/test/testQpidTimeToLive.py @@ -52,7 +52,7 @@ class ListenThread(threading.Thread): threading.Thread.__init__(self) def run(self): - from awips import QpidSubscriber + from ufpy import QpidSubscriber self.qs = QpidSubscriber.QpidSubscriber(self.hostname, self.portNumber, True) self.qs.topicSubscribe(self.topicName, self.receivedMessage)