Skip to content
Snippets Groups Projects
Commit 3411832b authored by Henrik Thostrup Jensen's avatar Henrik Thostrup Jensen
Browse files

have backend and dud test use configurable parent system

parent e379324a
No related branches found
No related tags found
No related merge requests found
...@@ -365,7 +365,7 @@ class SimpleBackend(service.Service): ...@@ -365,7 +365,7 @@ class SimpleBackend(service.Service):
yield self._doReserveAbort(conn) yield self._doReserveAbort(conn)
connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state) connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state)
reserve_timeout = self.service_registry.getHandler(registry.RESERVE_TIMEOUT, registry.NSI2_LOCAL) reserve_timeout = self.service_registry.getHandler(registry.RESERVE_TIMEOUT, self.parent_system)
reserve_timeout(conn.connection_id, connection_states, self.TPC_TIMEOUT, datetime.datetime.utcnow()) reserve_timeout(conn.connection_id, connection_states, self.TPC_TIMEOUT, datetime.datetime.utcnow())
...@@ -415,7 +415,7 @@ class SimpleBackend(service.Service): ...@@ -415,7 +415,7 @@ class SimpleBackend(service.Service):
yield state.inactive(conn) yield state.inactive(conn)
self.logStateUpdate(conn, 'INACTIVE') self.logStateUpdate(conn, 'INACTIVE')
error_event = self.service_registry.getHandler(registry.ERROR_EVENT, registry.NSI2_LOCAL) error_event = self.service_registry.getHandler(registry.ERROR_EVENT, self.parent_system)
connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state) connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state)
service_ex = (None, type(e), str(e), None, None) service_ex = (None, type(e), str(e), None, None)
error_event(conn.connection_id, 'activateFailed', connection_states, datetime.datetime.utcnow(), str(e), service_ex) error_event(conn.connection_id, 'activateFailed', connection_states, datetime.datetime.utcnow(), str(e), service_ex)
...@@ -429,12 +429,12 @@ class SimpleBackend(service.Service): ...@@ -429,12 +429,12 @@ class SimpleBackend(service.Service):
td = conn.end_time - datetime.datetime.utcnow() td = conn.end_time - datetime.datetime.utcnow()
log.msg('Connection %s: terminate scheduled for %s UTC (%i seconds)' % (conn.connection_id, conn.end_time.replace(microsecond=0), td.total_seconds()), system=self.log_system) log.msg('Connection %s: terminate scheduled for %s UTC (%i seconds)' % (conn.connection_id, conn.end_time.replace(microsecond=0), td.total_seconds()), system=self.log_system)
data_plane_change = self.service_registry.getHandler(registry.DATA_PLANE_CHANGE, registry.NSI2_LOCAL) data_plane_change = self.service_registry.getHandler(registry.DATA_PLANE_CHANGE, self.parent_system)
dps = (True, conn.revision, True) # data plane status - active, version, version consistent dps = (True, conn.revision, True) # data plane status - active, version, version consistent
data_plane_change(conn.connection_id, dps, datetime.datetime.utcnow()) data_plane_change(conn.connection_id, dps, datetime.datetime.utcnow())
except Exception, e: except Exception, e:
# this really should not happen # this really should not happen
log.msg('Error in post-activation: %s' % e) log.msg('Error in post-activation: %s: %s' % (type(e), e), system=self.log_system)
@defer.inlineCallbacks @defer.inlineCallbacks
...@@ -454,7 +454,7 @@ class SimpleBackend(service.Service): ...@@ -454,7 +454,7 @@ class SimpleBackend(service.Service):
yield state.inactive(conn) yield state.inactive(conn)
self.logStateUpdate(conn, 'INACTIVE') self.logStateUpdate(conn, 'INACTIVE')
error_event = self.service_registry.getHandler(registry.ERROR_EVENT, registry.NSI2_LOCAL) error_event = self.service_registry.getHandler(registry.ERROR_EVENT, self.parent_system)
connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state) connection_states = (conn.reservation_state, conn.provision_state, conn.lifecycle_state, conn.activation_state)
service_ex = (None, type(e), str(e), None, None) service_ex = (None, type(e), str(e), None, None)
error_event(conn.connection_id, 'deactivateFailed', connection_states, datetime.datetime.utcnow(), str(e), service_ex) error_event(conn.connection_id, 'deactivateFailed', connection_states, datetime.datetime.utcnow(), str(e), service_ex)
...@@ -464,7 +464,7 @@ class SimpleBackend(service.Service): ...@@ -464,7 +464,7 @@ class SimpleBackend(service.Service):
try: try:
yield state.inactive(conn) yield state.inactive(conn)
self.logStateUpdate(conn, 'INACTIVE') self.logStateUpdate(conn, 'INACTIVE')
data_plane_change = self.service_registry.getHandler(registry.DATA_PLANE_CHANGE, registry.NSI2_LOCAL) data_plane_change = self.service_registry.getHandler(registry.DATA_PLANE_CHANGE, self.parent_system)
dps = (False, conn.revision, True) # data plane status - active, version, version consistent dps = (False, conn.revision, True) # data plane status - active, version, version consistent
data_plane_change(conn.connection_id, dps, datetime.datetime.utcnow()) data_plane_change(conn.connection_id, dps, datetime.datetime.utcnow())
except Exception as e: except Exception as e:
......
...@@ -16,7 +16,8 @@ class DUDBackendTest(unittest.TestCase): ...@@ -16,7 +16,8 @@ class DUDBackendTest(unittest.TestCase):
self.clock = task.Clock() self.clock = task.Clock()
self.sr = registry.ServiceRegistry() self.sr = registry.ServiceRegistry()
self.backend = dud.DUDNSIBackend('Test', self.sr) self.registry_system = 'dud-test'
self.backend = dud.DUDNSIBackend('Test', self.sr, self.registry_system)
self.backend.scheduler.clock = self.clock self.backend.scheduler.clock = self.clock
self.backend.startService() self.backend.startService()
...@@ -93,7 +94,7 @@ class DUDBackendTest(unittest.TestCase): ...@@ -93,7 +94,7 @@ class DUDBackendTest(unittest.TestCase):
else: else:
d_down.callback(connection_id) d_down.callback(connection_id)
self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, self.registry_system)
_,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, self.service_params) _,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, self.service_params)
yield self.reserveCommit(None, self.provider_nsa, None, cid) yield self.reserveCommit(None, self.provider_nsa, None, cid)
...@@ -138,7 +139,7 @@ class DUDBackendTest(unittest.TestCase): ...@@ -138,7 +139,7 @@ class DUDBackendTest(unittest.TestCase):
values = connection_id, active, version_consistent, version, timestamp values = connection_id, active, version_consistent, version, timestamp
d_up.callback(values) d_up.callback(values)
self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, self.registry_system)
_,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, self.service_params) _,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, self.service_params)
yield self.reserveCommit(None, self.provider_nsa, None, cid) yield self.reserveCommit(None, self.provider_nsa, None, cid)
...@@ -184,7 +185,7 @@ class DUDBackendTest(unittest.TestCase): ...@@ -184,7 +185,7 @@ class DUDBackendTest(unittest.TestCase):
values = connection_id, connection_states, timeout_value, timestamp values = connection_id, connection_states, timeout_value, timestamp
d.callback(values) d.callback(values)
self.sr.registerEventHandler(registry.RESERVE_TIMEOUT, reserveTimeout, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.RESERVE_TIMEOUT, reserveTimeout, self.registry_system)
_,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, service_params) _,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, service_params)
...@@ -199,7 +200,6 @@ class DUDBackendTest(unittest.TestCase): ...@@ -199,7 +200,6 @@ class DUDBackendTest(unittest.TestCase):
_,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, service_params) _,_,cid,sp = yield self.reserve(None, self.provider_nsa, None, None, None, None, service_params)
@defer.inlineCallbacks @defer.inlineCallbacks
def testFaultyActivate(self): def testFaultyActivate(self):
...@@ -208,7 +208,7 @@ class DUDBackendTest(unittest.TestCase): ...@@ -208,7 +208,7 @@ class DUDBackendTest(unittest.TestCase):
def errorEvent(connection_id, event, connection_states, timestamp, info, ex): def errorEvent(connection_id, event, connection_states, timestamp, info, ex):
d_err.callback( (event, connection_id, connection_states, timestamp, info, ex) ) d_err.callback( (event, connection_id, connection_states, timestamp, info, ex) )
self.sr.registerEventHandler(registry.ERROR_EVENT, errorEvent, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.ERROR_EVENT, errorEvent, self.registry_system)
# make actication fail via monkey patching # make actication fail via monkey patching
self.backend.connection_manager.setupLink = \ self.backend.connection_manager.setupLink = \
...@@ -239,8 +239,8 @@ class DUDBackendTest(unittest.TestCase): ...@@ -239,8 +239,8 @@ class DUDBackendTest(unittest.TestCase):
def errorEvent(connection_id, event, connection_states, timestamp, info, ex): def errorEvent(connection_id, event, connection_states, timestamp, info, ex):
d_err.callback( (event, connection_id, connection_states, timestamp, info, ex) ) d_err.callback( (event, connection_id, connection_states, timestamp, info, ex) )
self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.DATA_PLANE_CHANGE, dataPlaneChange, self.registry_system)
self.sr.registerEventHandler(registry.ERROR_EVENT, errorEvent, registry.NSI2_LOCAL) self.sr.registerEventHandler(registry.ERROR_EVENT, errorEvent, self.registry_system)
# make actication fail via monkey patching # make actication fail via monkey patching
self.backend.connection_manager.teardownLink = \ self.backend.connection_manager.teardownLink = \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment