FD3-586 FD3-600 modelo OLT y template para ZTE v3. Se agrega Furukawa

app/DoctrineMigrations/src/oltmodel.yml

@@ -38,3 +38,17 @@ insertorupdate:
           library: "OIDSBase"
           extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V2\"\r\n}"
           tenancy_id: 1
+        -
+          id: 6
+          name: "Furukawa"
+          mark: "Furukawa"
+          library: "OIDSBase"
+          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/furukawa/telnet.py\",\r\n\"model\": \"Furukawa\"\r\n}"
+          tenancy_id: 1
+        -
+          id: 7
+          name: "ZTE C320 V3"
+          mark: "ZTE"
+          library: "OIDSBase"
+          extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V3\"\r\n}"
+          tenancy_id: 1

app/DoctrineMigrations/src/template.yml

@@ -95,4 +95,24 @@ INSERTORUPDATE:
         - id: 1009
           name: "DEL-ZTE-C320-V2"
           content: "configure terminal\r\n\r\ninterface gpon-olt_1/{{slot}}/{{link}} \r\n no onu {{onu}}\r\nexit\r\nexit"
-          owner: "admin"
+          owner: "admin"
+        -
+          id: 1010
+          name: "CONFIG-Furukawa"
+          content: "{##}"
+          owner: "admin"
+        -
+          id: 1011
+          name: "DEL-Furukawa"
+          content: "{##}"
+          owner: "admin"
+        -
+          id: 1012
+          name: "CONFIG-ZTE-C320-V3"
+          content: "{##}"
+          owner: "admin"
+        -
+          id: 1013
+          name: "DEL-ZTE-C320-V3"
+          content: "{##}"
+          owner: "admin"  

src/FTTHBundle/Admin/OLTModelAdmin.php

@@ -8,9 +8,15 @@ use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 class OLTModelAdmin extends BaseAdmin
 {
+    
+    protected $datagridValues = [
+        '_sort_by' => 'name',
+    ];
+    
     /**
      * @param DatagridMapper $datagridMapper
      */
@@ -53,11 +59,24 @@ class OLTModelAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $marks = OLTModelMark::getChoices();
-        $libraries = ['OIDSBase' => 'OIDSBase','OIDSFiberHomeV1' => 'OIDSFiberHomeV1','OIDSHuaweiV1' => 'OIDSHuaweiV1', 'OIDSFiberLinkV1' => 'OIDSFiberLinkV1', "OIDSZTEV1" => "OIDSZTEV1", "OIDSCalixV1" => "OIDSCalixV1"];
+        $libraries = [
+            'OIDSBase' => 'OIDSBase',
+            'OIDSFiberHomeV1' => 'OIDSFiberHomeV1',
+            'OIDSHuaweiV1' => 'OIDSHuaweiV1', 
+            'OIDSFiberLinkV1' => 'OIDSFiberLinkV1', 
+            'OIDSZTEV1' => 'OIDSZTEV1', 
+            'OIDSCalixV1' => 'OIDSCalixV1'
+        ];
         $formMapper
             ->add('name')
-            ->add('mark', 'choice', array('required'=>true, 'choices' => $marks))
-            ->add('library', 'choice', array('required'=>true, 'choices' => $libraries))
+            ->add('mark', ChoiceType::class, array(
+                'required' => true, 
+                'choices' => $marks
+            ))
+            ->add('library', ChoiceType::class, array(
+                'required' => true, 
+                'choices' => $libraries
+            ))
             ->add('netmiko')
             ->add('props')
             ->add('extraData')