Merge branch 'hotfix-remove-service-ports' into 'master'

Remove insert ports to others OLTs and mantained Huawei

See merge request interlink-sa/flowdat3/modules/ftth!158

src/FTTHBundle/Admin/ONUAdmin.php

@@ -321,31 +321,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                         ],
                     ))
                 ->end()
-                ->with('ZTE', ['class' => "col-md-12 {$hidden['ZTE']} olt_mark ZTE"])
-                    ->add('vlan', null, [
-                        'disabled' => $disabled,
-                        'attr' => [
-                            'readonly' => $readonly,
-                        ],
-                    ])
-                    ->add('vlanProfile', null, $optionsZTEV4)
-                    ->add('tcontprofile', null, [
-                        'disabled' => $disabled,
-                        'attr' => [
-                            'readonly' => $readonly,
-                        ],
-                    ])
-                ->end()
-                ->with("FiberLink | FiberHome", ['class' => "col-md-12 olt_mark FiberLink FiberHome"])
-                    ->add('vlans', null, array(
-                        'required' => false,
-                        'multiple' => true,
-                        'disabled' => $disabled,
-                        'attr' => [
-                            'readonly' => $readonly,
-                        ],
-                    ))
-                ->end()
                 ->with('Extra')
                     ->add('extraData')
                 ->end()
@@ -575,17 +550,6 @@ class ONUAdmin extends WorkflowBaseAdmin
                         'by_reference' => false,
                     ))
                 ->end()
-                ->with('ZTE', ['class' => "col-md-12 {$hidden['ZTE']} olt_mark ZTE"])
-                    ->add('vlan')
-                    ->add('vlanProfile', null, $optionsZTEV4)
-                    ->add('tcontprofile')
-                ->end()
-                ->with('FiberLink', ['class' => "col-md-12 {$hidden['FiberLink']} olt_mark FiberLink"])
-                    ->add('vlans', null, array(
-                        'required' => false,
-                        'multiple' => true,
-                    ))
-                    ->end()
             ->end()
             ->tab('Log')
                 ->with('Log')

src/FTTHBundle/EventListener/ONUSubscriber.php

@@ -300,7 +300,7 @@ class ONUSubscriber implements EventSubscriber
             
             if (isset($model_extra_data['auto-create-service-ports']) and 
                 $model_extra_data['auto-create-service-ports'] === true and count($sp) == 0
-                and count($vlans)) {
+                and count($vlans) and $onu->getNap()->getOlt()->getMark() == "Huawei") {
                 $olt = $onu->getNAP()->getOLT();
                 
                 // Se buscan los ServicePort utilizados en la OLT