Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: first client->server test is passing

Browse Source
This commit is contained in:
Swann Martinez
2019-07-18 11:14:43 +02:00
parent 5f3badc81e
commit aa73064eed
3 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
replication.py
View File

@ -37,9 +37,11 @@ class ReplicatedDataFactory(object):
def match_type_by_name(self,type_name): def match_type_by_name(self,type_name):
for stypes, implementation in self.supported_types: for stypes, implementation in self.supported_types:
if type_name == implementation.__class__.__name__: if type_name == stypes.__name__:
return implementation return implementation
return None
def construct_from_dcc(self,data): def construct_from_dcc(self,data):
implementation = self.match_type_by_instance(data) implementation = self.match_type_by_instance(data)
return implementation return implementation
@ -48,7 +50,7 @@ class ReplicatedDataFactory(object):
""" """
Reconstruct a new replicated value from serialized data Reconstruct a new replicated value from serialized data
""" """
return self.match_type_by_name(data) return self.match_type_by_name(type_name)
class ReplicatedDatablock(object): class ReplicatedDatablock(object):
""" """
@ -66,7 +68,7 @@ class ReplicatedDatablock(object):
assert(owner) assert(owner)
self.owner = owner self.owner = owner
self.pointer = data self.pointer = data
self.str_type = self.data.__class__.__name__ self.str_type = type(data).__name__
def push(self, socket): def push(self, socket):
@ -81,7 +83,7 @@ class ReplicatedDatablock(object):
key = self.uuid.encode() key = self.uuid.encode()
type = self.str_type.encode() type = self.str_type.encode()
socket.send_multipart([key,owner,str_type,data]) socket.send_multipart([key,owner,type,data])
@classmethod @classmethod
def pull(cls, socket, factory): def pull(cls, socket, factory):
@ -92,9 +94,14 @@ class ReplicatedDatablock(object):
""" """
uuid, owner,str_type, data = socket.recv_multipart(zmq.NOBLOCK) uuid, owner,str_type, data = socket.recv_multipart(zmq.NOBLOCK)
instance = factory.construct_from_net(str_type.decode())(owner=owner.decode(), uuid=uuid.decode())
instance.data = instance.deserialize(data) str_type = str_type.decode()
owner=owner.decode()
uuid=uuid.decode()
instance = factory.construct_from_net(str_type)(owner=owner, uuid=uuid)
# instance.data = instance.deserialize(data)
return instance return instance

14
replication_client.py
View File

@ -108,18 +108,18 @@ class ClientNetService(threading.Thread):
class Server(): class Server():
def __init__(self,config=None, factory=None): def __init__(self,config=None, factory=None):
self.rep_store = {} self._rep_store = {}
self.net = ServerNetService(store_reference=self.rep_store, factory=factory) self._net = ServerNetService(store_reference=self._rep_store, factory=factory)
# self.serve() # self.serve()
def serve(self): def serve(self):
self.net.start() self._net.start()
def state(self): def state(self):
return self.net.state return self._net.state
def stop(self): def stop(self):
self.net.stop() self._net.stop()
class ServerNetService(threading.Thread): class ServerNetService(threading.Thread):
@ -129,7 +129,7 @@ class ServerNetService(threading.Thread):
self.name = "ServerNetLink" self.name = "ServerNetLink"
self.daemon = True self.daemon = True
self.exit_event = threading.Event() self.exit_event = threading.Event()
self.store = store_reference self._rep_store = store_reference
self.context = zmq.Context.instance() self.context = zmq.Context.instance()
self.snapshot = None self.snapshot = None
@ -207,7 +207,7 @@ class ServerNetService(threading.Thread):
log.info("Receiving changes from client") log.info("Receiving changes from client")
msg = ReplicatedDatablock.pull(self.pull, self.factory) msg = ReplicatedDatablock.pull(self.pull, self.factory)
msg.store(self.store) msg.store(self._rep_store)
# msg = message.Message.recv(self.collector_sock) # msg = message.Message.recv(self.collector_sock)
# # logger.info("received object") # # logger.info("received object")
# # Update all clients # # Update all clients

35
test_replication.py
View File

@ -28,37 +28,7 @@ class RepSampleData(ReplicatedDatablock):
return pickle.load(data) return pickle.load(data)
# class TestClient(unittest.TestCase):
# def setUp(self):
# factory = ReplicatedDataFactory()
# self.client_api = Client(factory=factory)
# def test_client_connect(self):
# self.client_api.connect()
# time.sleep(1)
# self.assertEqual(self.client_api._net.state,1)
# def test_client_disconnect(self):
# self.client_api.disconnect()
# time.sleep(1)
# self.assertEqual(self.client_api._net.state,0)
class TestDataReplication(unittest.TestCase): class TestDataReplication(unittest.TestCase):
# def test_server_launching(self):
# log.info("test_server_launching")
# self.server_api.serve()
# time.sleep(1)
# self.assertEqual(self.server_api.state(),1)
# def test_server_stop(self):
# log.info("test_server_launching")
# self.server_api.stop()
# time.sleep(1)
# self.assertEqual(self.server_api.state(),0)
def test_setup_data_factory(self): def test_setup_data_factory(self):
factory = ReplicatedDataFactory() factory = ReplicatedDataFactory()
@ -80,8 +50,11 @@ class TestDataReplication(unittest.TestCase):
data_sample = SampleData() data_sample = SampleData()
data_sample_key = client_api.register(data_sample) data_sample_key = client_api.register(data_sample)
#Waiting for server to receive the datas
time.sleep(.1)
self.assertNotEqual(client_api._rep_store[data_sample_key],None) #Check if if receive them
self.assertNotEqual(server_api._rep_store[data_sample_key],None)