radarsys Commit - r209:90fa9a52ca2f · Jicamarca Repository

Standardize jars functions: start, stop, write, read, status...

Fiorella Quino -

r209:90fa9a52ca2f

parent child

Context file:

r209:90fa9a52ca2f

Collapse all files

apps/jars/models.py +57 -7

                  def status_device(self):
+                     try:
                      answer = api.status(self.device.ip_address,self.device.port_address)
                      self.device.status = int(answer[0])
+                         self.device.save()
                      self.message = answer[2:]
+                         if self.device.status == 0:
+                             return False
+                     except Exception as e:
+                         self.device.status = 0
+                         self.message = str(e)
                      self.device.save()
+                         return False
-                     return self.device.status
+                     return True
                  def stop_device(self):
+                     try:
                      answer = api.stop(self.device.ip_address,self.device.port_address)
                      self.device.status = int(answer[0])
                      self.message = answer[2:]
                      self.device.save()
+                         if self.device.status == 0 or self.device.status == 1:
+                             return False
-                     return self.device.status
+                     except Exception as e:
+                         self.device.status = 0
+                         self.message = str(e)
+                         self.device.save()
+                         return False
+                     return True
                  def read_device(self):
+                     try:
                      answer = api.read(self.device.ip_address,self.device.port_address)
                      self.device.status = int(answer[0])
-                     try:
+                         self.device.save()
+                         self.message = answer[2:]
+                         if self.device.status == 1:
+                             return False
                          data = json.loads(answer[2:])
                          parms = data['configurations']['jars']
                      except:
                          self.device.status = 0
                          self.device.save()
                          self.message = 'Could not read JARS configuration.'
-                         return ''
+                         return False
                      #self.dict_to_parms(parms)
                      self.message = 'Current JARS configuration was read successfully.'
                  def write_device(self):
+                     if self.device.status == 3:
+                         self.message = 'Could not configure device. Software Acquisition is running'
+                         return False
                      data = self.experiment.parms_to_dict()
                      data = json.loads(data)
                      data['configurations']['dds']         =''
                      data['configurations']['rc']['delays']=''
                      json_data = json.dumps(data)
+                     try:
                      answer = api.configure(self.device.ip_address,self.device.port_address,json_data)
-                     #print answer
                      self.device.status = int(answer[0])
                      self.message = answer[2:]
+                         self.device.save()
+                         if self.device.status == 1:
+                             return False
+                         if self.device.status == 3:
+                             return False
+                     except Exception as e:
+                         self.device.status = 0
+                         self.message = str(e)
                      self.device.save()
+                         return False
-                     return self.device.status
+                     return True
                  def start_device(self):
-                     self.write_device()
+                     try:
+                         answer = api.start(self.device.ip_address,self.device.port_address)
+                         self.device.status = int(answer[0])
+                         self.message = answer[2:]
+                         self.device.save()
+                         if self.device.status == 1:
+                             return False
+                     except Exception as e:
+                         self.device.status = 0
+                         self.message = str(e)
+                         self.device.save()
+                         return False
+                     return True
                  def echo(self):

apps/jars/views.py +1 -1

                  #kwargs['no_play'] = True
-                 kwargs['only_stop'] = True
+                 #kwargs['only_stop'] = True
                  ###### SIDEBAR ######
                  kwargs.update(sidebar(conf=conf))

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages