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
+                             (3,'Scheduled'),             #BLUE
-                             (4,'Not Configured'),        #WHITE
+                             (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:
+                    try:
-                        if conf.device.status in (0, 4):
+                        for conf in confs:
-                            result = 0
+                            conf.stop_device()
-                            return result
+                            conf.write_device()
-                    for conf in confs:
+                            conf.start_device()
-                        conf.stop_device()
+                            time.sleep(0.1)
-                        conf.write_device()
+                    except:
-                        conf.start_device()
+                        return 0
-                        time.sleep(1)
+                    return 2
-                    return result
                 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:
+                    try:
-                        if conf.device.status in (0, 4):
+                        for conf in confs:
-                            result = 0
+                            conf.stop_device()
-                            continue
+                    except:
-                        conf.stop_device()
+                        return 0
+                    return 1
-                    return result
                 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>
+                <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>
+                {% if dev_conf.pk == dev_conf.device.conf_active %}
-            	</tr>
+                  <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

@@ -1452,19 +1452,19 def dev_conf_status(request, id_conf):
1452		1452
1453	conf = get_object_or_404(Configuration, pk=id_conf)	1453	conf = get_object_or_404(Configuration, pk=id_conf)
1454		1454
1455	if conf.device.device_type.name == 'abs':	1455	conf_active = Configuration.objects.filter(pk=conf.device.conf_active).first()
1456	abs = request.user.profile.abs_active	1456	if conf_active<>conf:
1457	if abs<>conf:	1457	url = '#' if conf_active is None else conf_active.get_absolute_url()
1458	url = '#' if abs is None else abs.get_absolute_url()	1458	label = 'None' if conf_active is None else conf_active.label
1459	label = 'None' if abs is None else abs.label	1459	messages.warning(
1460	messages.warning(	1460	request,
1461	request,	1461	mark_safe('The current configuration has not been written to device, the active configuration is <a href="{}">{}</a>'.format(
1462	mark_safe('The current configuration has not been written in the modules, the active configuration is <a href="{}">{}</a>'.format(	1462	url,
1463	~~url~~,	1463	label
1464	~~label~~	1464	))
1465	))	1465	)
1466	)	1466
1467	return redirect(conf.get_absolute_url())	1467	return redirect(conf.get_absolute_url())
1468		1468
1469	if conf.status_device():	1469	if conf.status_device():
1470	messages.success(request, conf.message)	1470	messages.success(request, conf.message)
@@ -1493,6 +1493,8 def dev_conf_write(request, id_conf):
1493	conf = get_object_or_404(Configuration, pk=id_conf)	1493	conf = get_object_or_404(Configuration, pk=id_conf)
1494		1494
1495	if conf.write_device():	1495	if conf.write_device():
		1496	conf.device.conf_active = conf.pk
		1497	conf.device.save()
1496	messages.success(request, conf.message)	1498	messages.success(request, conf.message)
1497	if has_been_modified(conf):	1499	if has_been_modified(conf):
1498	conf.clone(type=1, template=False)	1500	conf.clone(type=1, template=False)
@@ -1841,9 +1843,20 def radar_refresh(request, id_camp, id_radar):
1841	campaign = get_object_or_404(Campaign, pk=id_camp)	1843	campaign = get_object_or_404(Campaign, pk=id_camp)
1842	experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']	1844	experiments = campaign.get_experiments_by_radar(id_radar)[0]['experiments']
1843		1845
1844	for exp in experiments:	1846	i = app.control.inspect()
1845	exp.get_status()	1847	scheduled = i.scheduled().values[0]
		1848	revoked = i.revoked().values[0]
1846		1849
		1850	for exp in experiments:
		1851	if exp.task in revoked:
		1852	exp.status = 1
		1853	elif exp.task in [t['request']['id'] for t in scheduled if 'task_start' in t['request']['name']]:
		1854	exp.status = 2
		1855	elif exp.task in [t['request']['id'] for t in scheduled if 'task_stop' in t['request']['name']]:
		1856	exp.status = 3
		1857	else:
		1858	exp.status = 4
		1859	exp.save()
1847	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))	1860	return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
1848		1861
1849		1862

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