radarsys_met Commit - r427:54e48e3c0fb2

Update clone(), add experiment parameter and create sirm-cam volume

eynilupu -

r427:54e48e3c0fb2

parent child

Context file:

r427:54e48e3c0fb2

.env +1 0

             #Volumes - path
             EXPOSE_SIRM=./volumes/sirm
             EXPOSE_PROC=./volumes/proc
+            EXPOSE_CAM=/path/to/cam
             EXPOSE_NAS=/path/to/nas_data
             EXPOSE_PGDATA=/path/to/pg_data
             EXPOSE_CERTS=/path/to/certs

README.md +1 0

                 DB_PASSWORD=****
                 #Volumes - path
+                EXPOSE_CAM=/path/to/cam
                 EXPOSE_NAS=/path/to/nas_data
                 EXPOSE_PGDATA=/path/to/pg_data
                 EXPOSE_CERTS=/path/to/certs

docker-compose.yml +9 -2

                   type: "none"
                   o: "bind"
                   device: "${EXPOSE_NAS}"
+              sirm_cam:
+                name: sirm_cam
+                driver: local
+                driver_opts:
+                  type: "none"
+                  o: "bind"
+                  device: "${EXPOSE_CAM}"
             services:
               sirm-nginx-proxy:
                   driver: "json-file"
                   options:
                     max-size: "12m"
-                # ports:
-                #   - 8086:5000
               sirm-monitor:
                 container_name: 'sirm-monitor'
                 restart: always
                 environment:
                   - VIRTUAL_HOST=${CAM_SITE}
+                volumes:
+                  - 'sirm_cam:./.wine/drive_c/iVMS-4200'
                 networks:
                   - frontend_sirm
                 logging:

volumes/sirm/apps/generator/models.py +2 0

                         r = requests.get(complete_url_trmode)
+                        self.clone(type=1, experiment = 'empty')
                         if r:
                             self.device.status = 3
                             self.device.save()

volumes/sirm/apps/main/models.py +8 -9

                         'heading': self.heading
                     }
-                    self.reception_rx.datadir = os.path.join(os.environ['EXPOSE_NAS'], data['name'], 'rawdata')
-                    self.reception_rx.save()
                     try:
-                        data['pedestal'] = self.pedestal.start_device()
+                        data['pedestal'] = self.pedestal.start_device(name_experiment=data['name'])
                         time.sleep(1.0)
                         self.generator_start()
                         time.sleep(1.0)
-                        data['usrp_tx'] = self.transmission_tx.start_device()
+                        data['usrp_tx'] = self.transmission_tx.start_device(name_experiment=data['name'])
                         time.sleep(1.0)
-                        data['usrp_rx'] = self.reception_rx.start_device()
+                        data['usrp_rx'] = self.reception_rx.start_device(name_experiment=data['name'])
                         time.sleep(0.1)
                         proc_url = 'http://'+os.environ['PROC_SITE']+'/start'
                         requests.post(proc_url, json=data)
             class Configuration(PolymorphicModel):
-                id = models.AutoField(primary_key=True)
+                id              = models.AutoField(primary_key=True)
+                experiment      = models.CharField(default='empty', editable=False, max_length=64, null=True, blank=True)
                 device          = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
                 type            = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
                 created_date    = models.DateTimeField(auto_now_add=True)
                 parameters      = models.TextField(default='{}')
                 author          = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
                 hash            = models.CharField(default='', max_length=64, null=True, blank=True)
-                message = ""
+                message         = ""
                 class Meta:
                     db_table = 'db_configurations'
                     return data
                 def clone(self, **kwargs):
+                    before_id = self.id
                     self.pk = None
                     self.id = None
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                     self.save()
+                    self.id = before_id
                     return self
                 def parms_to_dict(self):

volumes/sirm/apps/main/views.py +5 -3

                 if request.user.is_authenticated:
                     fields.append('my configurations')
                 form = FilterForm(initial=request.GET, extra_fields=fields)
-                kwargs['keys'] = ['name', 'device',
+                kwargs['keys'] = ['name', 'device', 'type',
-                                  'type', 'programmed_date', 'actions']
+                                'programmed_date', 'actions']
+                if request.GET.get('historical') == 'on':
+                    kwargs['keys'].insert(3, 'experiment')
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 kwargs['no_sidebar'] = True
                         if device.device_type.name == 'usrp_tx':
                             validation_usrp_tx_code(request, conf)
-                        conf.clone(type=1)
                         conf.save()
                         conf.author = request.user

volumes/sirm/apps/pedestal/models.py +7 -1

                     return True
-                def start_device(self):
+                def start_device(self, name_experiment=False):
                     if self.mode == 'table':
                         if len(self.angle.split(',')) > 1:
                         if self.mode == 'table':
                             payload['table'] = list_of_floats
+                        if name_experiment:
+                            name_experiment = name_experiment.split("@")
+                            self.clone(experiment=name_experiment[0], programmed_date=name_experiment[1], type=1)
+                        else:
+                            self.clone(type=1, experiment = 'empty')
                         if r:
                             self.device.status = 3
                             self.device.save()

volumes/sirm/apps/usrp_rx/models.py +21 -5

             import requests
             import base64
             from struct import pack
+            from datetime import datetime
+            import os
             from django.db import models
             from django.urls import reverse
                 datadir = models.CharField(
                     verbose_name="Data Directory",
                     max_length=100,
-                    default='',
+                    default='/to/path/NAME@YYYY-MM-DDTHH:MM:SS/rawdata',
                     blank=False,
                     null=False,
-                    help_text='Fill with a directory. Example: /media/soporte/DATA'
+                    help_text='Fill with a directory. Example: /media/soporte/DATA',
+                    editable=False
                 )
                 clocksource = models.CharField(
                     return True
-                def start_device(self):
+                def start_device(self, name_experiment=False):
                     try:
                         usrp = USRPRXConfiguration.objects.get(pk=self)
                         usrp_antenna_rx = usrp.get_antenna_rx_display()
                         usrp_clocksource = usrp.get_clocksource_display()
                         usrp_timesource = usrp.get_timesource_display()
+                        if name_experiment:
+                            self.datadir = os.path.join(os.environ['EXPOSE_NAS'], name_experiment, 'rawdata')
+                            self.save()
+                            name_experiment = name_experiment.split("@")
+                            self.clone(experiment=name_experiment[0], programmed_date=name_experiment[1], type=1)
+                        else:
+                            data_name = 'empty@{}'.format(datetime.now().isoformat().split('.')[0])
+                            self.datadir = os.path.join(os.environ['EXPOSE_NAS'], data_name, 'rawdata')
+                            self.save()
+                            self.clone(type=1, experiment = 'empty')
                         payload = {'ip_address': usrp.ip_address_rx, 'daughterboard': usrp_daughterboard_rx, 'antenna': usrp_antenna_rx, 'sample_rate': usrp.samplerate_rx, 'frequency': usrp.frequency_rx,
-                                'datadir': usrp.datadir, 'clock_source': usrp_clocksource, 'time_source': usrp_timesource, 'clock_rate':usrp.clockrate}
+                                'datadir': self.datadir, 'clock_source': usrp_clocksource, 'time_source': usrp_timesource, 'clock_rate':usrp.clockrate}
                         r = requests.post(self.device.url("usrprx"), json=payload)
                         if r:
                             self.device.status = 3
                             self.device.save()

volumes/sirm/apps/usrp_tx/models.py +7 -1

                     return True
-                def start_device(self):
+                def start_device(self, name_experiment=False):
                     try:
                         usrp = USRPTXConfiguration.objects.get(pk=self)
                             'repetitions_1': usrp.repetitions_1, 'enable_2': usrp.enable_2}
                         r = requests.post(self.device.url("usrptx"), json=payload)
+                        if name_experiment:
+                            name_experiment = name_experiment.split("@")
+                            self.clone(experiment=name_experiment[0], programmed_date=name_experiment[1], type=1)
+                        else:
+                            self.clone(type=1, experiment = 'empty')
                         if r:
                             self.device.status = 3

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