Se añade funcionalidad al tr069.

composer.lock

@@ -1723,7 +1723,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TR069Bundle.git",
-                "reference": "09cac7c760aedb51fc7dbd30996641a141335963"
+                "reference": "ba0d6e3607a413c2d75f44907dafdc50a52303f0"
             },
             "require": {
                 "ext-curl": "*"
@@ -1735,7 +1735,7 @@
                 }
             },
             "description": "The Flowdat3 TR069",
-            "time": "2018-03-05T18:39:59+00:00"
+            "time": "2018-03-05T19:03:19+00:00"
         },
         {
             "name": "ik/webservice-bundle",

src/FTTHBundle/Admin/ONUAdmin.php

@@ -132,6 +132,10 @@ class ONUAdmin extends WorkflowBaseAdmin
             $devices = $this->get('tr069.api')->getDevices($query);
             
             if(is_array($devices) && isset($devices[0]) && isset($devices[0]['_id'])) {
+
+                /* print_r("<pre>");
+                print_r($devices[0]);
+                die; */
                 $tr069Data = $this->getTR069Data($devices[0]);
 
                 $id = $tr069Data['_id'] ?? null;
@@ -142,8 +146,9 @@ class ONUAdmin extends WorkflowBaseAdmin
                 $ip = $tr069Data['ExternalIPAddress']['_value'] ?? null;
 
                 $ssid = $tr069Data['SSID']['_value'] ?? null;
-                //$pass = $tr069Data['keyPassphrase']['_value'] ?? null;
                 $pass = $tr069Data['preSharedKey']['_value'] ?? null;
+                $broadcast = $tr069Data['SSIDAdvertisementEnabled']['_value'] ?? null;
+                $status = $tr069Data['Status']['_value'] ?? null;
                 
                 $catv = $tr069Data['CatvPower']['_value'] ?? null;
                 
@@ -162,6 +167,8 @@ class ONUAdmin extends WorkflowBaseAdmin
                         ->with('WIFI',['description' => $this->trans('helps.tr069_wifi')])
                             ->add('tr069_ssid', 'text', array('mapped' => false, 'data' => $ssid, 'required' => false))
                             ->add('tr069_pass', 'text', array('mapped' => false, 'data' => $pass, 'required' => false))
+                            ->add('tr069_broadcast', CheckboxType::class, array('mapped' => false, 'data' => $broadcast, 'required' => false))
+                            ->add('tr069_status', CheckboxType::class, array('mapped' => false, 'data' => $status, 'required' => false))
                         ->end()
                         ->with('CATV',['description' => $this->trans('helps.tr069_catv')])
                             ->add('tr069_catv', CheckboxType::class, array('mapped' => false, 'data' => $catv, 'required' => false))
@@ -278,14 +285,16 @@ class ONUAdmin extends WorkflowBaseAdmin
             $pass = ($this->getForm()->get('tr069_pass')->getData()) ?? null;
             $id = ($this->getForm()->get('tr069_id')->getData()) ?? null;;
             $catv = ($this->getForm()->get('tr069_catv')->getData()) ?? null;
-    
-            if($ssid) {
-                $aux = $this->get('tr069.api')->setWlan($id, $ssid, $pass);
-            }
+            $broadcast = ($this->getForm()->get('tr069_broadcast')->getData()) ?? null;
+            $status = ($this->getForm()->get('tr069_status')->getData()) ?? null;
+
+            if($ssid) $aux = $this->get('tr069.api')->setWlan($id, $ssid, $pass);
             
-            if(!is_null($catv)) {
-                $aux = $this->get('tr069.api')->setCATV($id, $catv);
-            }
+            if(!is_null($catv)) $aux = $this->get('tr069.api')->setCATV($id, $catv);
+            
+            if(!is_null($broadcast)) $aux = $this->get('tr069.api')->setWbroadcast($id, $broadcast);
+            
+            if(!is_null($status)) $aux = $this->get('tr069.api')->setWstatus($id, $status);
         }
         
     }
@@ -392,14 +401,13 @@ class ONUAdmin extends WorkflowBaseAdmin
     private function getTR069Data($data) {
         $result = array();
 
-        /* (isset($data['_id']))? $result['_id'] = $data['_id'] : $result['_id'] = null;
-        (isset($data['_deviceId']))? $result['_deviceId'] = $data['_deviceId'] : $result['_deviceId'] = null; */
-
         $result['_id'] = $data['_id'] ?? null;
         $result['_deviceId'] = $data['_deviceId'] ?? null;
 
         $result['SSID'] = $data['InternetGatewayDevice']['LANDevice']['1']['WLANConfiguration']['1']['SSID'] ?? null;
         $result['keyPassphrase'] = $data['InternetGatewayDevice']['LANDevice']['1']['WLANConfiguration']['1']['KeyPassphrase'] ?? null;
+        $result['SSIDAdvertisementEnabled'] = $data['InternetGatewayDevice']['LANDevice']['1']['WLANConfiguration']['1']['SSIDAdvertisementEnabled'] ?? null;
+        $result['Status'] = $data['InternetGatewayDevice']['LANDevice']['1']['WLANConfiguration']['1']['Enable'] ?? null;
         
         //InternetGatewayDevice.LANDevice.1.WLANConfiguration.1.PreSharedKey.1.PreSharedKey
         $result['preSharedKey'] = $data['InternetGatewayDevice']['LANDevice']['1']['WLANConfiguration']['1']['PreSharedKey']['1']['PreSharedKey'] ?? null;

src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -123,6 +123,8 @@ form:
     label_tr069_product_class: Product Class
     label_tr069_serial_number: Serial Number
     label_tr069_ip: IP
+    label_tr069_broadcast: Broadcast SSID
+    label_tr069_status: Enable SSID
 
 list:
     label_id: Id