浏览代码

FD3-542 Se agregó campo status para Host. FD3-543 migration para HostType

Espinoza Guillermo 7 年之前
父节点
当前提交
5c21dd2acb

+ 14 - 0
app/DoctrineMigrations/src/host_type.yml

@@ -0,0 +1,14 @@
+insertorupdate:
+    host_type:
+        -
+          id: 1
+          name: "Cablemodem"
+          shortname: "cm"
+        -
+          id: 2
+          name: "CPE"
+          shortname: "cpe"
+        -
+          id: 3
+          name: "MTA"
+          shortname: "mta"

+ 13 - 0
src/IPv4Bundle/Admin/SubNetAdmin.php

@@ -7,6 +7,7 @@ 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 SubNetAdmin extends BaseAdmin
 {
@@ -17,6 +18,8 @@ class SubNetAdmin extends BaseAdmin
     {
         $datagridMapper
             ->add('address')
+            ->add('allowedHostType')
+            ->add('status')
         ;
     }
 
@@ -29,6 +32,7 @@ class SubNetAdmin extends BaseAdmin
             ->add('address')
             ->add('options')
             ->add('allowedHostType')
+            ->add('status')
             ->add('netGroup')
             ->add('ipPool')
             ->add('_action', null, array(
@@ -51,6 +55,14 @@ class SubNetAdmin extends BaseAdmin
             ->with('')
                 ->add('address')
                 ->add('allowedHostType')
+                ->add('status', ChoiceType::class, [
+                    'required' => false,
+                    'choices' => [
+                        'none' => '',
+                        'active' => 'active',
+                        'suspended' => 'suspended',
+                    ],
+                ])
                 ->add('netGroup')
             ->end()
             ->end()
@@ -65,6 +77,7 @@ class SubNetAdmin extends BaseAdmin
         $showMapper
             ->add('address')
             ->add('allowedHostType')
+            ->add('status')
             ->add('netGroup')
             ->add('ipPool')
         ;

+ 26 - 0
src/IPv4Bundle/Entity/SubNet.php

@@ -88,6 +88,12 @@ class SubNet implements TenancyIdTraitInterface, WorkflowInterface
      */
     protected $currentState = null;
 
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    protected $status = null;
+
+
     public function __construct()
     {
         $this->ipPool = new ArrayCollection;
@@ -247,6 +253,26 @@ class SubNet implements TenancyIdTraitInterface, WorkflowInterface
         }
     }
 
+    /**
+     * @param string $status
+     *
+     * @return SubNet
+     */
+    public function setStatus($status = null)
+    {
+        $this->status = $status;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
     /**
     * @param ExecutionContextInterface $context
     */

+ 5 - 0
src/IPv4Bundle/Resources/translations/IPv4Bundle.es.yml

@@ -41,6 +41,7 @@ form:
     label_extra_data: Extra Data
     label_log_servers: Log Servers
     label_time_servers: Time Servers
+    label_status: Estado
 
 list:
     label_mac: Mac
@@ -60,6 +61,7 @@ list:
     label_ip_pool: IP Pool
     label_state: Estado
     label_extra_data: Extra Data
+    label_status: Estado
 
 show:
     label_mac: Mac
@@ -96,6 +98,7 @@ show:
     label_extra_data: Extra Data
     label_log_servers: Log Servers
     label_time_servers: Time Servers
+    label_status: Estado
 
 filter:
     label_mac: Mac
@@ -109,6 +112,8 @@ filter:
     label_options: Opciones
     label_state: Estado
     label_extra_data: Extra Data
+    label_allowed_host_type: Tipo de Host permitido
+    label_status: Estado
 
 breadcrumb:
     link_host_list: Listado Host