diff --git a/RPi_Client/CoAPthon3/coapclient.py b/RPi_Client/CoAPthon3/coapclient.py index bbc12949f1655a78658f06cb039c4f0ba23ef1a1..2bb67af110730f74b0df7f8c0ae2f50f0abdc8e1 100644 --- a/RPi_Client/CoAPthon3/coapclient.py +++ b/RPi_Client/CoAPthon3/coapclient.py @@ -21,7 +21,6 @@ class CoapClient(): def __init__(self): # complete self.ip = "shmd01.iptime.org" self.myMAC = ':'.join(re.findall('..', '%012x' % uuid.getnode())) - #self.clearMyData() self.myuuid, self.operate = self.obtainMyID() if self.operate == 1: # rpNode가 이미 한 개 이상존재하는 경우 self._beacon = BeaconEmit() @@ -29,34 +28,6 @@ class CoapClient(): if self.operate != 2: self.calculateNodePositionAtServer() -""" - def clearMyData(self): # complete - path = "/rpNodeInfoPath" - - path = "coap://" + self.ip + path - host, port, path = parse_uri(path) - try: - tmp = socket.gethostbyname(host) - host = tmp - except socket.gaierror: - pass - - client = HelperClient(server=(host, port)) - - try: - payload = { - 'option' : -1, #clear my data from Server - 'rpMAC' : self.myMAC - } - response = client.put(path, json.dumps(payload)) - print((response.pretty_print())) - - except KeyboardInterrupt: - print("obtainMyID Stop") - client.stop() - - client.stop() -""" def obtainMyID(self): # complete path = "/rpNodeInfoPath" diff --git a/Server_CoAP/CoAPthon3/exampleresources.py b/Server_CoAP/CoAPthon3/exampleresources.py index e9026f9416c6022f815100c6f5489909efb520d3..07b0e9179ff2fb526098669faf74af6204f9e415 100644 --- a/Server_CoAP/CoAPthon3/exampleresources.py +++ b/Server_CoAP/CoAPthon3/exampleresources.py @@ -48,15 +48,6 @@ class RpNodeInfoResource(Resource): response.payload = self.postRpNodeInfoInDB(self.payload) response.code = defines.Codes.CHANGED.number return self, response -""" - def deleteNodeData(self, info): # complete - info = info['rpMAC'] - graphColletion = self.db.RpGraphData - if self.collection.find({'rpMAC' : info}).count() != 0: - rpuuid = self.collection.find({'rpMAC' : info})[0]['rpuuid'] - graphColletion.remove({'v2' : rpuuid}) - self.collection.remove({'rpMAC' : info}) -""" def postRpNodeInfoInDB(self, info): # complete info = info['rpMAC']