fix

app/config/parameters.yml.dist

@@ -29,18 +29,18 @@ parameters:
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    db_session_host: 127.0.0.1
+    db_session_host: mysql
     db_session_port: null
     db_session_name: fd_session
     db_session_user: root
-    db_session_password: null
+    db_session_password: '%env(MYSQL_ROOT_PASSWORD)%'
 
     # RabbitMQ routing key 
     env(HOST_AMQP): amqp
     env(AMQP_KEY): ftth
 
     cookie_domain_client: '%env(CLIENT)%'
-    cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
+    cookie_domain: '%cookie_domain_client%.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session, flowdat_dhcp_session]
 
     # nombre del servicio del nginx

app/config/parameters.yml.docker

@@ -28,10 +28,10 @@ parameters:
     rabbit_mq.vhost:    '/'
 
     db_session_host: mysql
-    db_session_port: ~
+    db_session_port: null
     db_session_name: fd_session
     db_session_user: root
-    db_session_password: 235r2342gtfsw
+    db_session_password: '%env(MYSQL_ROOT_PASSWORD)%'
     
     # RabbitMQ routing key 
     env(HOST_AMQP): amqp

app/config/url_webservice.yml.dist

@@ -1,16 +1,16 @@
 parameters:
-    url_base: 'http://%env(HOST_BASE)%'
-    url_ftth: 'http://%env(HOST_FTTH)%'
-    url_mapas: 'http://%env(HOST_MAPAS)%'
-    url_stats: 'http://%env(HOST_STATS)%'
-    url_radius: 'http://%env(HOST_RADIUS)%'
-    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%'
-    url_dhcp: 'http://%env(HOST_DHCP)%'
-    url_geoserver: 'http://%env(HOST_GEOSERVER)%' # url app radius
-    url_dummy: 'http://%env(HOST_DUMMY)%'
+    url_base: 'https://%env(HOST_BASE)%'
+    url_ftth: 'https://%env(HOST_FTTH)%'
+    url_mapas: 'https://%env(HOST_MAPAS)%'
+    url_stats: 'https://%env(HOST_STATS)%'
+    url_radius: 'https://%env(HOST_RADIUS)%'
+    url_cablemodem: 'https://%env(HOST_CABLEMODEM)%'
+    url_dhcp: 'https://%env(HOST_DHCP)%'
+    url_geoserver: 'https://%env(HOST_GEOSERVER)%' # url app radius
+    url_dummy: 'https://%env(HOST_DUMMY)%'
 
     onu: '%url_ftth%/api/onus.json'
-    client: 'http://%env(HOST_BASE)%/api/clients.json'
+    client: 'https://%env(HOST_BASE)%/api/clients.json'
     sidebar_menu:
         Base: '%url_base%'
         Cablemodems: '%url_cablemodem%'
@@ -22,8 +22,8 @@ parameters:
     remote_client_create_url: '%url_base%/admin/client/client/create'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
-    remote_get_map_url: 'http://%env(DOCKER_MAPAS)%:8000/api/maps.json'
-    remote_get_object_type_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
-    remote_get_objects_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objects.json'
+    remote_get_map_url: 'https://%env(DOCKER_MAPAS)%:8000/api/maps.json'
+    remote_get_object_type_url: 'https://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
+    remote_get_objects_url: 'https://%env(DOCKER_MAPAS)%:8000/api/objects.json'
     api_ftth: 'http://ftth:8000'
     api_mapas: 'http://mapas:8000'

app/config/url_webservice.yml.docker

@@ -1,15 +1,15 @@
 parameters:
-    url_base: 'http://%env(HOST_BASE)%'
-    url_ftth: 'http://%env(HOST_FTTH)%'
-    url_mapas: 'http://%env(HOST_MAPAS)%'
-    url_stats: 'http://%env(HOST_STATS)%'
-    url_radius: 'http://%env(HOST_RADIUS)%'
-    url_cablemodem: 'http://%env(HOST_CABLEMODEM)%'
-    url_dhcp: 'http://%env(HOST_DHCP)%'
-    url_geoserver: 'http://%env(HOST_GEOSERVER)%' # url app radius
+    url_base: 'https://%env(HOST_BASE)%'
+    url_ftth: 'https://%env(HOST_FTTH)%'
+    url_mapas: 'https://%env(HOST_MAPAS)%'
+    url_stats: 'https://%env(HOST_STATS)%'
+    url_radius: 'https://%env(HOST_RADIUS)%'
+    url_cablemodem: 'https://%env(HOST_CABLEMODEM)%'
+    url_dhcp: 'https://%env(HOST_DHCP)%'
+    url_geoserver: 'https://%env(HOST_GEOSERVER)%' # url app radius
 
     onu: '%url_ftth%/api/onus.json'
-    client: 'http://%env(HOST_BASE)%/api/clients.json'
+    client: 'https://%env(HOST_BASE)%/api/clients.json'
     sidebar_menu:
         Base: '%url_base%'
         Cablemodems: '%url_cablemodem%'
@@ -21,8 +21,8 @@ parameters:
     remote_client_create_url: '%url_base%/admin/client/client/create'
     remote_device_url: '%url_base%/api/devices.json'
     remote_device_log_url: '%url_base%/api/devicelogs.json'
-    remote_get_map_url: 'http://%env(DOCKER_MAPAS)%:8000/api/maps.json'
-    remote_get_object_type_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
-    remote_get_objects_url: 'http://%env(DOCKER_MAPAS)%:8000/api/objects.json'
+    remote_get_map_url: 'https://%env(DOCKER_MAPAS)%:8000/api/maps.json'
+    remote_get_object_type_url: 'https://%env(DOCKER_MAPAS)%:8000/api/objecttypes.json'
+    remote_get_objects_url: 'https://%env(DOCKER_MAPAS)%:8000/api/objects.json'
     api_ftth: 'http://ftth:8000'
     api_mapas: 'http://mapas:8000'

composer.lock

@@ -1946,7 +1946,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "23cdb48744f9ce049bec55a25e5fca3ef6e0f546"
+                "reference": "aa9e5432f4fc70ae78b4912a68479afcf3f9137b"
             },
             "type": "library",
             "autoload": {
@@ -1961,7 +1961,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-08-06T17:48:40+00:00"
+            "time": "2018-08-08T13:50:30+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -2036,7 +2036,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/MapBundle.git",
-                "reference": "cbe6fe78fbd902ee545806105967b89f50e244e7"
+                "reference": "6bfead82caa4fefdc56bf8060b275a56347feb70"
             },
             "type": "library",
             "autoload": {
@@ -2051,7 +2051,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-02-19T12:57:23+00:00"
+            "time": "2018-08-08T13:51:34+00:00"
         },
         {
             "name": "ik/migrations-bundle",

src/FTTHBundle/Form/ONUType.php

@@ -38,6 +38,7 @@ class ONUType extends AbstractType
         $builder->add('ip')
             ->add('mac')
             ->add('serialNumber')
+            ->add('activationCode')
             ->add('profile')
             ->add('model')
             ->add('nap')

src/RadiusBundle/Entity/NAS.php

@@ -268,7 +268,7 @@ class NAS implements TenancyIdTraitInterface, DeviceInterface, LocationInterface
         $deviceData['ip'] = $this->host;
         $deviceData['tenancy'] = $this->tenancyId;
 
-        $deviceExtraData = array('snmpCommunity' => $this->snmpCommunity, 'snmpVersion' => $this->snmpVersion, 'radiusPassword' => $this->radiusPassword,
+        $deviceExtraData = array('snmpCommunity' => $this->snmpComunity, 'snmpVersion' => $this->snmpVersion, 'radiusPassword' => $this->radiusPassword,
             'acctEnabled' => $this->acctEnabled, 'description' => $this->description);
 
         if ($this->model) {