Selaa lähdekoodia

FD3-576 se agrega ip fija en cablemodem

Espinoza Guillermo 7 vuotta sitten
vanhempi
commit
1dc0a1f4f0

+ 6 - 6
composer.lock

@@ -1457,7 +1457,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "329e1ae099e739ba2770f4c3029c02b139dece91"
+                "reference": "97587f95769fcfac8f3c43fae36aa02633960f62"
             },
             "type": "library",
             "autoload": {
@@ -1472,7 +1472,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-06-26T14:21:26+00:00"
+            "time": "2018-07-04T17:03:04+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1643,7 +1643,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "14e7b7c9d0deadf8c779874419cf2f183a02bbf8"
+                "reference": "7e50327475180f03fa24a2fa5ee1dc01dadd2bfa"
             },
             "require": {
                 "ik/base-admin-bundle": "*"
@@ -1661,7 +1661,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2018-04-24T15:29:11+00:00"
+            "time": "2018-07-04T14:44:27+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1690,7 +1690,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "47ca3a59560cd1e7d8ae5e06ddbea62094fc2996"
+                "reference": "184c2d1c00423b71fd1eae098eead7b938de1882"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1720,7 +1720,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-06-25T18:50:13+00:00"
+            "time": "2018-07-04T14:51:55+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

+ 3 - 0
src/CablemodemBundle/Admin/CablemodemAdmin.php

@@ -80,6 +80,9 @@ class CablemodemAdmin extends WorkflowBaseAdmin
                                 'required' => false,
                                 'allow_delete' => true))
                     ->end()
+                    ->with('DHCP')
+                        ->add('fixedIP')
+                    ->end()
                 ->end()
         ;
     }

+ 1 - 0
src/CablemodemBundle/Command/DHCPHostCRUDCommand.php

@@ -96,6 +96,7 @@ EOT
                 'mac' => $mac,
                 'hostType' => $hostType,
                 'state' => 'active',
+                'fixedIP' => $cablemodem->getFixedIP(),
             ];
 
             $dhcpOptions = $cablemodem->getDHCPOptions();

+ 26 - 1
src/CablemodemBundle/Entity/Cablemodem.php

@@ -119,7 +119,7 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
      * @ORM\ManyToOne(targetEntity="\WorkflowBundle\Entity\Workflow", fetch="EXTRA_LAZY")
      * @ORM\JoinColumn(name="workflow_id", referencedColumnName="id", onDelete="SET NULL")
      *
-     * @JMS\MaxDepth(1)
+     * @JMS\Exclude
      */
     protected $workflow;
 
@@ -153,6 +153,11 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
      * )
      */
     protected $voip = null;
+    
+    /**
+     * @ORM\Column(type="boolean", nullable=true)
+     */
+    protected $fixedIP = false;
 
 
     /**
@@ -429,5 +434,25 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
 
         if(isset($this->voip[$index])) return $this->voip[$index];
     }
+    
+    /**
+     * @return boolean
+     */
+    public function getFixedIP()
+    {
+        return $this->fixedIP;
+    }
+    
+    /**
+     * @param boolean $fixedIP
+     *
+     * @return Cablemodem
+     */
+    public function setFixedIP($fixedIP)
+    {
+        $this->fixedIP = $fixedIP;
+        
+        return $this;
+    }
 
 }

+ 2 - 0
src/CablemodemBundle/Resources/translations/CablemodemBundle.es.yml

@@ -70,6 +70,8 @@ form:
     label_docs_version: Versión DOCSIS
     label_mta_enabled: MTA Enabled
     label_voip: Voip
+    label_fixed_i_p: IP fija
+    
 list:
     label_id: Id
     label_name: Nombre