Merge con master

composer.lock

@@ -1003,23 +1003,23 @@
         },
         {
             "name": "doctrine/orm",
-            "version": "v2.5.6",
+            "version": "v2.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/doctrine2.git",
-                "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b"
+                "reference": "e3aa3f2d1d7ac4bc732f8630f78fcb92d2885e68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6c434196c8ef058239aaa0724b4aadb0107940b",
-                "reference": "e6c434196c8ef058239aaa0724b4aadb0107940b",
+                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e3aa3f2d1d7ac4bc732f8630f78fcb92d2885e68",
+                "reference": "e3aa3f2d1d7ac4bc732f8630f78fcb92d2885e68",
                 "shasum": ""
             },
             "require": {
                 "doctrine/cache": "~1.4",
                 "doctrine/collections": "~1.2",
-                "doctrine/common": ">=2.5-dev,<2.8-dev",
-                "doctrine/dbal": ">=2.5-dev,<2.6-dev",
+                "doctrine/common": ">=2.5-dev,<2.9-dev",
+                "doctrine/dbal": ">=2.5-dev,<2.7-dev",
                 "doctrine/instantiator": "~1.0.1",
                 "ext-pdo": "*",
                 "php": ">=5.4",
@@ -1075,7 +1075,7 @@
                 "database",
                 "orm"
             ],
-            "time": "2016-12-18T15:42:34+00:00"
+            "time": "2017-08-13T18:46:56+00:00"
         },
         {
             "name": "friendsofsymfony/rest-bundle",
@@ -1397,7 +1397,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "34a97b23026ed6f9d39dffd1c9b2fdcdac71d1a9"
+                "reference": "58bc1159ba61996ed300a9072ee5ec691b38bbcf"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-10 13:59:53"
+            "time": "2017-08-11 17:26:08"
         },
         {
             "name": "ik/device-bundle",
@@ -1420,7 +1420,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "35d336147d737f1127c033411515f65521347045"
+                "reference": "f41487cb33cde26a8af8cef1e23ccb5c286fdb57"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1435,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-08-10 15:20:26"
+            "time": "2017-08-14 17:12:36"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1609,7 +1609,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "c969f0df3d6f36ebf7a1d072e0800cfb1189b42e"
+                "reference": "0f3977e0e2db4c2f16436379083483bc9c9ef149"
             },
             "require": {
                 "ext-curl": "*",
@@ -1622,7 +1622,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-08-11 13:23:35"
+            "time": "2017-08-14 14:08:43"
         },
         {
             "name": "ik/workflow-bundle",
@@ -4180,16 +4180,16 @@
         },
         {
             "name": "sonata-project/admin-bundle",
-            "version": "3.20.1",
+            "version": "3.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "10c27f6ee911c452ee67059bfdc1a1fca8953904"
+                "reference": "f9efb1a88da25461196510ba7b7ec8df94ae97cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/10c27f6ee911c452ee67059bfdc1a1fca8953904",
-                "reference": "10c27f6ee911c452ee67059bfdc1a1fca8953904",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/f9efb1a88da25461196510ba7b7ec8df94ae97cb",
+                "reference": "f9efb1a88da25461196510ba7b7ec8df94ae97cb",
                 "shasum": ""
             },
             "require": {
@@ -4275,7 +4275,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-06-27T15:41:31+00:00"
+            "time": "2017-08-14T08:42:47+00:00"
         },
         {
             "name": "sonata-project/block-bundle",

src/FTTHBundle/Admin/NAPAdmin.php

@@ -63,13 +63,4 @@ class NAPAdmin extends BaseAdmin
             ->add('extraData');
     }
 
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
-
 }

src/FTTHBundle/Admin/OLTAdmin.php

@@ -108,12 +108,5 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->end()   
         ;
     }
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
+    
 }

src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -73,12 +73,5 @@ class OLTModelAdmin extends BaseAdmin
             ->add('extraData')
         ;
     }
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
+    
 }

src/FTTHBundle/Admin/ONUAdmin.php

@@ -112,13 +112,4 @@ class ONUAdmin extends WorkflowBaseAdmin
             ->end();
     }
 
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
-
 }

src/FTTHBundle/Admin/ONUModelAdmin.php

@@ -56,13 +56,4 @@ class ONUModelAdmin extends BaseAdmin
             ->add('extraData');
     }
 
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
-
 }

src/FTTHBundle/Admin/ProfileAdmin.php

@@ -65,13 +65,4 @@ class ProfileAdmin extends BaseAdmin
             ->add('extraData');
     }
 
-    /**
-     * @param mixed $object
-     */
-    public function prePersist($object)
-    {
-        parent::prePersist($object);
-        $this->addTenancyIdFromServicie($object);
-    }
-
 }

src/FTTHBundle/Entity/OLT.php

@@ -419,7 +419,7 @@ class OLT implements DeviceInterface, TenancyIdTraitInterface
         $deviceData['deviceType'] = get_class($this);
         $deviceData['deviceId'] = $this->id;
         $deviceData['ip'] = $this->ip;
-        $deviceData['tenancyId'] = $this->tenancyId;
+        $deviceData['tenancy'] = $this->tenancyId;
 
         $deviceExtraData = array('snmpCommunity' => $this->snmpCommunity, 'sshUser' => $this->sshUser, 'sshPass' => $this->sshPass,
                                  'libraryVersion' => $this->libraryVersion, 'name' => $this->name);

src/FTTHBundle/Entity/ONU.php

@@ -617,7 +617,7 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
         $deviceData['deviceType'] = get_class($this);
         $deviceData['deviceId'] = $this->id;
         $deviceData['ip'] = $this->ip;
-        $deviceData['tenancyId'] = $this->tenancyId;
+        $deviceData['tenancy'] = $this->tenancyId;
 
         $deviceExtraData = array('mac' => $this->mac, 'serialNumber' => $this->serialNumber, 'ponSerialNumber' => $this->ponSerialNumber,
             'clientId' => $this->clientId);