Browse Source

FD3-744 fixes templates y actions workflow 2

Espinoza Guillermo 6 years ago
parent
commit
d6f63bd5ad

File diff suppressed because it is too large
+ 2 - 2
app/DoctrineMigrations/src/action.yml


+ 1 - 1
app/DoctrineMigrations/src/template.yml

@@ -93,7 +93,7 @@ INSERTORUPDATE:
     -
         id: 19
         name: "DEL-Huawei-MA5608T"
-        content: "{% set lineprofile = '6' %}\r\n{% set srvprofile = '5' %}\r\n{%  set onu_pos = onu %}\r\n{%  set onu = em.getRepository('FTTHBundle:ONU').find(onuid) %}\r\n{% set ont = onu.position %}\r\n{% set slot = onu.nap.slot %}\r\n{% set link = onu.nap.link %}\r\n\r\nconfig\r\n{% for sp in onu.getServicePorts() %}\r\nundo service-port {{sp.number}}\r\n{% endfor %}\r\n\r\n\r\ninterface gpon 0/{{slot}}\r\nont delete {{link}} {{onu_pos}}\r\nquit"
+        content: "config\r\n\r\n{% for number in sp|split(',') %}\r\nundo service-port {{number}}\r\n{% endfor %}\r\n\r\ninterface gpon 0/{{slot}}\r\nont delete {{link}} {{onu}}\r\n\r\nquit"
         owner: "iksop"
     -
         id: 20

+ 10 - 0
src/FTTHBundle/Entity/ONU.php

@@ -1028,5 +1028,15 @@ class ONU implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
     {
         return $this->onuProfile;
     }
+    
+    /**
+     * @return string
+     */
+    public function getServicePortsNumbers()
+    {
+        return implode(',', array_map(function($servicePort) {
+            return $servicePort->getNumber();
+        }, $this->servicePorts));
+    }
 
 }

+ 0 - 33
src/FTTHBundle/Repository/ONURepository.php

@@ -31,37 +31,4 @@ class ONURepository extends \Doctrine\ORM\EntityRepository
         return $qb->getQuery()->getResult();
     }
     
-    /**
-     * @param int $id
-     * 
-     * @return ONU
-     */
-    public function findSoftDelete($id)
-    {
-        $this->em = $this->getEntityManager();
-        $enableFilters = [];
-        $filters = $this->em->getFilters();
-        $disabledFilters = ['tenancy_filter', 'soft_deleteable'];
-        foreach ($disabledFilters as $disableFilter) {
-            if ($filters->isEnabled($disableFilter)) {
-                $filters->disable($disableFilter);
-                $enableFilters[] = $disableFilter;
-            }
-        }
-        
-        $qb = $this->createQueryBuilder('ONU');
-        $qb->andWhere($qb->expr()->eq('ONU.id', ':id'));
-        $parameters = [
-            'id' => $id,
-        ];
-        $qb->setParameters($parameters);
-        $onu = $qb->getQuery()->getResult();
-
-        foreach ($enableFilters as $enableFilter) {
-            $filters->enable($enableFilter);
-        }
-        
-        return $onu;
-    }
-
 }