bumped the sbe driver version.

removed all references to mi driver references and replaced them
with their ION errors

ion/agents/instrument/instrument_agent.py

@@ -42,14 +42,6 @@
 import numpy
 import gevent
 
-# MI exceptions
-from ion.core.includes.mi_exceptions import InstrumentTimeoutException
-from ion.core.includes.mi_exceptions import InstrumentParameterException
-from ion.core.includes.mi_exceptions import SampleException
-from ion.core.includes.mi_exceptions import InstrumentStateException
-from ion.core.includes.mi_exceptions import InstrumentProtocolException
-from ion.core.includes.mi_exceptions import InstrumentException
-
 # ION imports.
 from ion.agents.instrument.driver_process import DriverProcess
 from ion.agents.instrument.common import BaseEnum
@@ -355,12 +347,12 @@ def _handler_inactive_go_active(self, *args, **kwargs):
             try:
                 next_state = self._dvr_client.cmd_dvr('discover_state')
                 break
-            except InstrumentTimeoutException, InstrumentProtocolException:
+            except Timeout, ResourceError:
                 no_tries += 1
                 if no_tries >= max_tries:
                     self._dvr_client.cmd_dvr('disconnect')
-                    # fixfix
-                    raise ResourceError('Could not discover instrument state.')
+                    log.error("Could not discover instrument state")
+                    raise 
 
         return (next_state, None)
 

ion/agents/instrument/test/test_instrument_agent.py

@@ -121,7 +121,7 @@
 IA_CLS = 'InstrumentAgent'
 
 # A seabird driver.
-DRV_URI = 'http://sddevrepo.oceanobservatories.org/releases/seabird_sbe37smb_ooicore-0.0.4-py2.7.egg'
+DRV_URI = 'http://sddevrepo.oceanobservatories.org/releases/seabird_sbe37smb_ooicore-0.0.5-py2.7.egg'
 DRV_MOD = 'mi.instrument.seabird.sbe37smb.ooicore.driver'
 DRV_CLS = 'SBE37Driver'