radarsys Commit - r329:7d210f98eba4 · Jicamarca Repository

Check for active configuration for status update

Juan C. Espinoza -

r329:7d210f98eba4

parent child

Context file:

r329:7d210f98eba4

Collapse all files

apps/abs/models.py +1 -3

                      self.device.status = 3
                      self.module_status = ''.join(status)
                      self.save()
-                     for u in User.objects.all():
-                         u.profile.abs_active = self
-                         u.save()
                      return True

apps/abs/views.py +1 -1

                  conf = get_object_or_404(ABSConfiguration, pk=id_conf)
-                 abs = request.user.profile.abs_active
+                 abs = Configuration.objects.filter(pk=conf.device.conf_active).first()
                  if abs<>conf:
                      url = '#' if abs is None else abs.get_absolute_url()
                      label = 'None' if abs is None else abs.label

apps/main/models.py +22 -29

              EXP_STATES = (
                               (0,'Error'),                 #RED
-                              (1,'Configured'),            #BLUE
+                              (1,'Cancelled'),             #YELLOW
                               (2,'Running'),               #GREEN
-                              (3,'Scheduled'),             #YELLOW
-                              (4,'Not Configured'),        #WHITE
+                              (3,'Scheduled'),             #BLUE
+                              (4,'Unknown'),               #WHITE
                           )
              CONF_TYPES = (
              class Profile(models.Model):
                  user = models.OneToOneField(User, on_delete=models.CASCADE)
                  theme = models.CharField(max_length=30, default='spacelab')
-                 abs_active = models.ForeignKey('Configuration', null=True, blank=True, verbose_name='Current ABS')
              @receiver(post_save, sender=User)
                  port_address = models.PositiveSmallIntegerField(default=2000)
                  description = models.TextField(blank=True, null=True)
                  status = models.PositiveSmallIntegerField(default=0, choices=DEV_STATES)
+                 conf_active = models.PositiveIntegerField(default=0, verbose_name='Current configuration')
                  class Meta:
                      db_table = 'db_devices'
                      ABS-CGS-DDS-RC-JARS
                      '''
-                     result = 2
                      confs = []
                      allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
                      rc_mix = [conf for conf in allconfs if conf.device.device_type.name=='rc' and conf.mix]
                              confs.append(conf)
                      else:
                          confs = allconfs
-                     #Only Configured Devices.
-                     for conf in confs:
-                         if conf.device.status in (0, 4):
-                             result = 0
-                             return result
-                     for conf in confs:
-                         conf.stop_device()
-                         conf.write_device()
-                         conf.start_device()
-                         time.sleep(1)
-                     return result
+                     try:
+                         for conf in confs:
+                             conf.stop_device()
+                             conf.write_device()
+                             conf.start_device()
+                             time.sleep(0.1)
+                     except:
+                         return 0
+                     return 2
                  def stop(self):
                      DDS-JARS-RC-CGS-ABS
                      '''
-                     result = 1
                      confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
                      confs=confs.exclude(device__device_type__name='cgs')
-                     for conf in confs:
-                         if conf.device.status in (0, 4):
-                             result = 0
-                             continue
-                         conf.stop_device()
-                     return result
+                     try:
+                         for conf in confs:
+                             conf.stop_device()
+                     except:
+                         return 0
+                     return 1
                  def get_status(self):
                      if self.status == 0:
                          color = "danger"
                      elif self.status == 1:
-                         color = "info"
+                         color = "warning"
                      elif self.status == 2:
                          color = "success"
                      elif self.status == 3:
-                         color = "warning"
+                         color = "info"
                      return color

apps/main/templates/dev_conf.html +7 -3

              {% block content-detail %}
              <table class="table table-bordered">
              	<tr>
-             		<th>Status</th>
-             		<td class="text-{{dev_conf.device.status_color}}"><strong> {% if dev_conf.device.device_type.name == 'abs' %} {{connected_modules}} {% else %} {{dev_conf.device.get_status_display}}{% endif %}</strong></td>
-             	</tr>
+                 <th>Status</th>
+                 {% if dev_conf.pk == dev_conf.device.conf_active %}
+                   <td class="text-{{dev_conf.device.status_color}}"><strong> {% if dev_conf.device.device_type.name == 'abs' %} {{connected_modules}} {% else %} {{dev_conf.device.get_status_display}}{% endif %}</strong></td>
+                 {% else %}
+                   <td class="text-info"><strong> Connected </strong></td>
+                 {% endif %}
+                 </tr>
              	{% for key in dev_conf_keys %}
              	<tr>

apps/main/templates/experiment.html +2 -2

                              <i class="fa fa-3x fa-puzzle-piece"></i>
                             {%endif%}
                                 <h4>{{item}}<br><small>{{item.device.ip_address}}</small>
-             		       {%if experiment.status == 3 %}
+             		       {%if item.pk != item.device.conf_active %}
              		       <span class="label label-info">Configured</span>
              		       {%else%}
              		       <span class="label label-{{item.device.status_color}}">{{item.device.get_status_display}}</span>
-                                    {%endif%}
+                        {%endif%}
              		   </h4>
                           </a>
                      </div>

apps/main/views.py +28 -15

                  conf = get_object_or_404(Configuration, pk=id_conf)
-                 if conf.device.device_type.name == 'abs':
-                     abs = request.user.profile.abs_active
-                     if abs<>conf:
-                         url = '#' if abs is None else abs.get_absolute_url()
-                         label = 'None' if abs is None else abs.label
-                         messages.warning(
-                             request,
-                             mark_safe('The current configuration has not been written in the modules, the active configuration is <a href="{}">{}</a>'.format(
-                                 url,
-                                 label
-                                 ))
+                             )
-                         return redirect(conf.get_absolute_url())
+                 conf_active = Configuration.objects.filter(pk=conf.device.conf_active).first()
+                 if conf_active<>conf:
+                     url = '#' if conf_active is None else conf_active.get_absolute_url()
+                     label = 'None' if conf_active is None else conf_active.label
+                     messages.warning(
+                         request,
+                         mark_safe('The current configuration has not been written to device, the active configuration is <a href="{}">{}</a>'.format(
+                             url,
+                             label
+                             ))
+                         )
+                     return redirect(conf.get_absolute_url())
                  if conf.status_device():
                      messages.success(request, conf.message)
                  conf = get_object_or_404(Configuration, pk=id_conf)
                  if conf.write_device():
+                     conf.device.conf_active = conf.pk
+                     conf.device.save()
                      messages.success(request, conf.message)
                      if has_been_modified(conf):
                          conf.clone(type=1, template=False)
                  campaign = get_object_or_404(Campaign, pk=id_camp)
                  experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
-                 for exp in experiments:
-                     exp.get_status()
+                 i = app.control.inspect()
+                 scheduled = i.scheduled().values[0]
+                 revoked = i.revoked().values[0]
+                 for exp in experiments:
+                     if exp.task in revoked:
+                         exp.status = 1
+                     elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:
+                         exp.status = 2
+                     elif exp.task in [t['request']['id'] for t in scheduled if 'task_stop' in t['request']['name']]:
+                         exp.status = 3
+                     else:
+                         exp.status = 4
+                     exp.save()
                  return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

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