Agregados para la librería de conexión por ssh

Agregados de datos de conexión en la olt

app/DoctrineMigrations/src/oltmodel.yml

@@ -6,14 +6,14 @@ insertorupdate:
             props: "NULL"
             mark: "FiberHome"
             library: "OIDSBase"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberhome/telnet.py\",\r\n\"model\": \"FiberHome-AN5516-01\"\r\n}"
+            extra_data: "{\r\n\"model\": \"FiberHome-AN5516-01\"\r\n}"
             tenancy_id: 1
         -
             id: 2
             name: "Fiberlink"
             mark: "FiberLink"
             library: "OIDSFiberLinkV1"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/fiberlink/telnet.py\",\r\n\"model\": \"Fiberlink\"\r\n}"
+            extra_data: "{\r\n\"model\": \"Fiberlink\"\r\n}"
             tenancy_id: 1
         -
             id: 3
@@ -21,7 +21,7 @@ insertorupdate:
             props: "NULL"
             mark: "Huawei"
             library: "OIDSHuaweiV1"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/huawei/telnet.py\",\r\n\"model\": \"Huawei-MA5608T\",\r\n\"auto-create-service-ports\" : true\r\n}"
+            extra_data: "{\r\n\"model\": \"Huawei-MA5608T\",\r\n\"auto-create-service-ports\" : true\r\n}"
             tenancy_id: 1
         -
             id: 4
@@ -29,33 +29,33 @@ insertorupdate:
             props: "NULL"
             mark: "ZTE"
             library: "OIDSBase"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320\"\r\n}"
+            extra_data: "{\r\n\"model\": \"ZTE-C320\"\r\n}"
             tenancy_id: 1
         -
             id: 5
             name: "ZTE C320 V2"
             mark: "ZTE"
             library: "OIDSBase"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V2\"\r\n}"
+            extra_data: "{\r\n\"model\": \"ZTE-C320-V2\"\r\n}"
             tenancy_id: 1
         -
             id: 6
             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}"
+            extra_data: "{\r\n\"model\": \"ZTE-C320-V3\"\r\n}"
             tenancy_id: 1
         -
             id: 7
             name: "ZTE C320 V4"
             mark: "ZTE"
             library: "OIDSZTEV1"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/zte/telnet.py\",\r\n\"model\": \"ZTE-C320-V4\"\r\n}"
+            extra_data: "{\r\n\"model\": \"ZTE-C320-V4\"\r\n}"
             tenancy_id: 2
         -
             id: 8
             name: "Furukawa"
             mark: "Furukawa"
             library: "OIDSBase"
-            extra_data: "{\r\n\"telnet_cmd\": \"/usr/bin/furukawa/telnet.py\",\r\n\"model\": \"Furukawa\"\r\n}"
+            extra_data: "{\r\n\"model\": \"Furukawa\"\r\n}"
             tenancy_id: 1

src/FTTHBundle/Admin/OLTAdmin.php

@@ -26,6 +26,9 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
+            ->add('enablePass')
+            ->add('sshPort')
+            ->add('sshConnect')
             ->add('backups')
         ;
     }
@@ -42,6 +45,9 @@ class OLTAdmin extends WorkflowBaseAdmin
             ->add('snmpCommunity')
             ->add('sshUser')
             ->add('sshPass')
+            ->add('enablePass')
+            ->add('sshPort')
+            ->add('sshConnect')
             ->add('enable')
             ->add('backups')
 //            ->add('workflow')
@@ -81,6 +87,9 @@ class OLTAdmin extends WorkflowBaseAdmin
                         ->add('snmpCommunity')
                         ->add('sshUser')
                         ->add('sshPass')
+                        ->add('enablePass')
+                        ->add('sshPort')
+                        ->add('sshConnect')
                         //->add('enable')
                     ->end()
                 ->end()
@@ -119,6 +128,9 @@ class OLTAdmin extends WorkflowBaseAdmin
                     ->add('snmpCommunity')
                     ->add('sshUser')
                     ->add('sshPass')
+                    ->add('enablePass')
+                    ->add('sshPort')
+                    ->add('sshConnect')
                     ->add('enable')
                 ->end()
             ->end()

src/FTTHBundle/Entity/OLT.php

@@ -3,6 +3,7 @@
 namespace FTTHBundle\Entity;
 
 use Base\AdminBundle\Interfaces\PreRemoveInterface;
+use Base\AdminBundle\Interfaces\SoftDeleteInterface;
 use Base\AdminBundle\Traits\TenancyIdTrait;
 use Base\AdminBundle\Traits\TenancyIdTraitInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -13,13 +14,12 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Workflow\Exception\ExceptionInterface;
 use DeviceBundle\Validator\Constraints as ValidatorAssert;
 use DeviceBundle\Interfaces\DeviceInterface;
+use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity as SoftDeleteable;
 use MapBundle\Entity\Interfaces\LocationInterface;
 use MapBundle\Entity\Traits\LocationTrait;
 use WorkflowBundle\Entity\Interfaces\WorkflowInterface;
 use WorkflowBundle\Entity\Traits\WorkflowTrait;
-use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity as SoftDeleteable;
 use Gedmo\Mapping\Annotation as Gedmo;
-use Base\AdminBundle\Interfaces\SoftDeleteInterface;
 
 /**
  * @ORM\Entity
@@ -82,6 +82,27 @@ class OLT implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
      */
     protected $sshPass;
 
+    /**
+     * @var string $enablePass
+     *
+     * @ORM\Column(type="string", length=255, nullable=true, unique=false)
+     */
+    protected $enablePass;
+
+    /**
+     * @var int $port
+     *
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    protected $sshPort;
+
+    /**
+     * @var boolean $sshConnect
+     *
+     * @ORM\Column(type="boolean", options={"default": false})
+     */
+    protected $sshConnect;
+
     /**
      * @var string $libraryVersion
      *
@@ -654,4 +675,54 @@ class OLT implements DeviceInterface, TenancyIdTraitInterface, LocationInterface
         }
         return $resp;
     }
+
+    /**
+     * @return string
+     */
+    public function getEnablePass()
+    {
+        return $this->enablePass;
+    }
+
+    /**
+     * @param string $enablePass
+     */
+    public function setEnablePass($enablePass)
+    {
+        $this->enablePass = $enablePass;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSshPort()
+    {
+        return $this->sshPort;
+    }
+
+    /**
+     * @param int $sshPort
+     */
+    public function setSshPort($sshPort)
+    {
+        $this->sshPort = $sshPort;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSshConnect()
+    {
+        return $this->sshConnect;
+    }
+
+    /**
+     * @param bool $sshConnect
+     */
+    public function setSshConnect($sshConnect)
+    {
+        $this->sshConnect = $sshConnect;
+    }
+
+
 }

src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -164,7 +164,9 @@ form:
     label_template: Template
     label_vlan_profile: VLAN Profile
     label_onu_profile: ONU Profile
-
+    label_enable_pass: Enable Password
+    label_ssh_port: SSH Port
+    label_ssh_connect: Conexión por SSH
 list:
     label_id: Id
     label_ip: Ip
@@ -228,6 +230,9 @@ list:
     label_template: Template
     label_vlan_profile: VLAN Profile
     label_onu_profile: ONU Profile
+    label_enable_pass: Enable Password
+    label_ssh_port: SSH Port
+    label_ssh_connect: Conexión por SSH
 
 show:
     label_id: Id
@@ -294,6 +299,9 @@ show:
     label_template: Template
     label_vlan_profile: VLAN Profile
     label_onu_profile: ONU Profile
+    label_enable_pass: Enable Password
+    label_ssh_port: SSH Port
+    label_ssh_connect: Conexión por SSH
 
 helps:
     check_address: Verifique la dirección para el cálculo de distancias.