Skip to content
Snippets Groups Projects
Commit cf93dff2 authored by Server (Shared Users)'s avatar Server (Shared Users)
Browse files

revise client

parent 26e48f13
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ class CoapClient(): ...@@ -21,7 +21,6 @@ class CoapClient():
def __init__(self): # complete def __init__(self): # complete
self.ip = "shmd01.iptime.org" self.ip = "shmd01.iptime.org"
self.myMAC = ':'.join(re.findall('..', '%012x' % uuid.getnode())) self.myMAC = ':'.join(re.findall('..', '%012x' % uuid.getnode()))
#self.clearMyData()
self.myuuid, self.operate = self.obtainMyID() self.myuuid, self.operate = self.obtainMyID()
if self.operate == 1: # rpNode가 이미 한 개 이상존재하는 경우 if self.operate == 1: # rpNode가 이미 한 개 이상존재하는 경우
self._beacon = BeaconEmit() self._beacon = BeaconEmit()
...@@ -29,34 +28,6 @@ class CoapClient(): ...@@ -29,34 +28,6 @@ class CoapClient():
if self.operate != 2: if self.operate != 2:
self.calculateNodePositionAtServer() 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 def obtainMyID(self): # complete
path = "/rpNodeInfoPath" path = "/rpNodeInfoPath"
......
...@@ -48,15 +48,6 @@ class RpNodeInfoResource(Resource): ...@@ -48,15 +48,6 @@ class RpNodeInfoResource(Resource):
response.payload = self.postRpNodeInfoInDB(self.payload) response.payload = self.postRpNodeInfoInDB(self.payload)
response.code = defines.Codes.CHANGED.number response.code = defines.Codes.CHANGED.number
return self, response 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 def postRpNodeInfoInDB(self, info): # complete
info = info['rpMAC'] info = info['rpMAC']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment