Merge remote-tracking branch 'origin/master' into demo

composer.lock

@@ -1397,7 +1397,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "ff5e48247d1a30e78fc34b30443945ea004f767d"
+                "reference": "58bc1159ba61996ed300a9072ee5ec691b38bbcf"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-10 13:18:56"
+            "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": "f801d9002000c0804b5e8436dc1f4ac6a0143514"
+                "reference": "f6b8fdcefdf517a0a28f4c8abd79940228e6ac7c"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1435,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-08-01 18:49:14"
+            "time": "2017-08-15 13:45:08"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1565,7 +1565,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "dc5bad4b0b90885bd49b17472aa24267e3d4f15d"
+                "reference": "b52ce2ca48888b55efae468773b25f2119348c5e"
             },
             "require": {
                 "ext-curl": "*",
@@ -1578,7 +1578,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-08-09 12:58:39"
+            "time": "2017-08-15 13:48:13"
         },
         {
             "name": "ik/workflow-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

@@ -613,7 +613,7 @@ class ONU 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('mac' => $this->mac, 'serialNumber' => $this->serialNumber, 'ponSerialNumber' => $this->ponSerialNumber,
             'clientId' => $this->clientId);