Merge branch 'feature-implement-voip' into 'master'

Make the changes to implement VoIP in API

See merge request interlink-sa/flowdat3/modules/api!8

src/Swagger/Client/FTTH/Api/ONUTemplateApi.php

@@ -386,9 +386,9 @@ class ONUTemplateApi
      * @throws \InvalidArgumentException
      * @return \Swagger\Client\FTTH\Model\ONUTemplate[]
      */
-    public function getList($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
+    public function getList($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_voip = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
     {
-        list($response) = $this->getListWithHttpInfo($filters_id, $filters_model, $filters_profile, $filters_tcontprofile, $filters_traffic_profile_in, $filters_traffic_profile_out, $filters_vlan, $filters_vlan_profile, $filters_onu_profile, $filters_base, $filters_catv, $filters_tenancy_id, $filters_qb_criteria, $limit, $page);
+        list($response) = $this->getListWithHttpInfo($filters_id, $filters_model, $filters_profile, $filters_tcontprofile, $filters_traffic_profile_in, $filters_traffic_profile_out, $filters_vlan, $filters_vlan_profile, $filters_onu_profile, $filters_base, $filters_catv, $filters_voip, $filters_tenancy_id, $filters_qb_criteria, $limit, $page);
         return $response;
     }
 
@@ -417,10 +417,10 @@ class ONUTemplateApi
      * @throws \InvalidArgumentException
      * @return array of \Swagger\Client\FTTH\Model\ONUTemplate[], HTTP status code, HTTP response headers (array of strings)
      */
-    public function getListWithHttpInfo($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
+    public function getListWithHttpInfo($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_voip = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
     {
         $returnType = '\Swagger\Client\FTTH\Model\ONUTemplate[]';
-        $request = $this->getListRequest($filters_id, $filters_model, $filters_profile, $filters_tcontprofile, $filters_traffic_profile_in, $filters_traffic_profile_out, $filters_vlan, $filters_vlan_profile, $filters_onu_profile, $filters_base, $filters_catv, $filters_tenancy_id, $filters_qb_criteria, $limit, $page);
+        $request = $this->getListRequest($filters_id, $filters_model, $filters_profile, $filters_tcontprofile, $filters_traffic_profile_in, $filters_traffic_profile_out, $filters_vlan, $filters_vlan_profile, $filters_onu_profile, $filters_base, $filters_catv, $filters_voip, $filters_tenancy_id, $filters_qb_criteria, $limit, $page);
 
         try {
             $options = $this->createHttpClientOption();
@@ -600,6 +600,7 @@ class ONUTemplateApi
      * @param  int $filters_onu_profile Id de la ONU profile. (optional)
      * @param  int $filters_base Si esta en 1, trae la plantilla por defecto. (optional)
      * @param  int $filters_catv Si esta en 1, trae las plantillas con catv. (optional)
+     * @param  int $filters_voip Si esta en 1, trae las plantillas con voip. (optional)
      * @param  int $filters_tenancy_id Tenancia de la plantilla. (optional, default to 2)
      * @param  int $filters_qb_criteria Criteria true. (optional, default to 1)
      * @param  int $limit Cantidad de registros por página. (optional, default to 20)
@@ -608,7 +609,7 @@ class ONUTemplateApi
      * @throws \InvalidArgumentException
      * @return \GuzzleHttp\Psr7\Request
      */
-    protected function getListRequest($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
+    protected function getListRequest($filters_id = null, $filters_model = null, $filters_profile = null, $filters_tcontprofile = null, $filters_traffic_profile_in = null, $filters_traffic_profile_out = null, $filters_vlan = null, $filters_vlan_profile = null, $filters_onu_profile = null, $filters_base = null, $filters_catv = null, $filters_voip = null, $filters_tenancy_id = '2', $filters_qb_criteria = '1', $limit = '20', $page = '0')
     {
 
         $resourcePath = '/onutemplates.json';
@@ -663,6 +664,10 @@ class ONUTemplateApi
             $queryParams['filters[catv]'] = ObjectSerializer::toQueryValue($filters_catv);
         }
         // query params
+        if ($filters_catv !== null) {
+            $queryParams['filters[voip]'] = ObjectSerializer::toQueryValue($filters_voip);
+        }
+        // query params
         if ($filters_tenancy_id !== null) {
             if (!$this->isDisabledTenancy()) {
                 $queryParams['filters[tenancyId]'] = ObjectSerializer::toQueryValue($filters_tenancy_id);

src/Swagger/Client/FTTH/Api/ValidationApi.php

@@ -320,7 +320,7 @@ class ValidationApi
                 $values = $api->getList(null, null, $ponSerialNumber, null, null,
                     null, null, null, null, null,
                     null, null, null, null, null,
-                    null, null, null, null, $tenancy, 1, 1000000, 0);
+                    null, null, null, null, null, $tenancy, 1, 1000000, 0);
                 $resp = $util->valueExistsLower($ponSerialNumber,
                     $values,
                     "getPonSerialNumber");

src/Swagger/Client/FTTH/Model/ONU.php

@@ -77,6 +77,7 @@ class ONU implements ModelInterface, ArrayAccess
         'traffic_profile_out' => '\Swagger\Client\FTTH\Model\TrafficProfile',
         'traffic_profile_in' => '\Swagger\Client\FTTH\Model\TrafficProfile',
         'catv' => 'bool',
+        'voip' => 'bool',
         'olt' => '\Swagger\Client\FTTH\Model\OLT',
         'position' => 'int',
         'client_id' => 'int',
@@ -108,6 +109,7 @@ class ONU implements ModelInterface, ArrayAccess
         'traffic_profile_out' => null,
         'traffic_profile_in' => null,
         'catv' => null,
+        'voip' => null,
         'olt' => null,
         'position' => null,
         'client_id' => null,
@@ -160,6 +162,7 @@ class ONU implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'trafficProfileOut',
         'traffic_profile_in' => 'trafficProfileIn',
         'catv' => 'catv',
+        'voip' => 'voip',
         'olt' => 'olt',
         'position' => 'position',
         'client_id' => 'clientId',
@@ -191,6 +194,7 @@ class ONU implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'setTrafficProfileOut',
         'traffic_profile_in' => 'setTrafficProfileIn',
         'catv' => 'setCatv',
+        'voip' => 'setVoip',
         'olt' => 'setOlt',
         'position' => 'setPosition',
         'client_id' => 'setClientId',
@@ -222,6 +226,7 @@ class ONU implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'getTrafficProfileOut',
         'traffic_profile_in' => 'getTrafficProfileIn',
         'catv' => 'getCatv',
+        'voip' => 'getVoip',
         'olt' => 'getOlt',
         'position' => 'getPosition',
         'client_id' => 'getClientId',
@@ -304,6 +309,7 @@ class ONU implements ModelInterface, ArrayAccess
         $this->container['traffic_profile_out'] = isset($data['traffic_profile_out']) ? $data['traffic_profile_out'] : null;
         $this->container['traffic_profile_in'] = isset($data['traffic_profile_in']) ? $data['traffic_profile_in'] : null;
         $this->container['catv'] = isset($data['catv']) ? $data['catv'] : null;
+        $this->container['voip'] = isset($data['voip']) ? $data['voip'] : null;
         $this->container['olt'] = isset($data['olt']) ? $data['olt'] : null;
         $this->container['position'] = isset($data['position']) ? $data['position'] : null;
         $this->container['client_id'] = isset($data['client_id']) ? $data['client_id'] : null;
@@ -785,6 +791,29 @@ class ONU implements ModelInterface, ArrayAccess
         return $this;
     }
 
+    /**
+     * Gets voip
+     *
+     * @return int
+     */
+    public function getVoip()
+    {
+        return $this->container['voip'];
+    }
+
+    /**
+     * Sets catv
+     *
+     * @param int $voip Si esta en 1 significa que posee voip.
+     *
+     * @return $this
+     */
+    public function setVoip($voip)
+    {
+        $this->container['voip'] = $voip;
+        return $this;
+    }
+
     /**
      * Gets olt
      *

src/Swagger/Client/FTTH/Model/ONUCRUD.php

@@ -74,6 +74,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'int',
         'traffic_profile_in' => 'int',
         'catv' => 'bool',
+        'voip' => 'bool',
         'olt' => 'int',
         'position' => 'int',
         'client_id' => 'int',
@@ -102,6 +103,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         'traffic_profile_out' => null,
         'traffic_profile_in' => null,
         'catv' => null,
+        'voip' => null,
         'olt' => null,
         'position' => null,
         'client_id' => null,
@@ -151,6 +153,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'trafficProfileOut',
         'traffic_profile_in' => 'trafficProfileIn',
         'catv' => 'catv',
+        'voip' => 'voip',
         'olt' => 'olt',
         'position' => 'position',
         'client_id' => 'clientId',
@@ -179,6 +182,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'setTrafficProfileOut',
         'traffic_profile_in' => 'setTrafficProfileIn',
         'catv' => 'setCatv',
+        'voip' => 'setVoip',
         'olt' => 'setOlt',
         'position' => 'setPosition',
         'client_id' => 'setClientId',
@@ -207,6 +211,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         'traffic_profile_out' => 'getTrafficProfileOut',
         'traffic_profile_in' => 'getTrafficProfileIn',
         'catv' => 'getCatv',
+        'voip' => 'getVoip',
         'olt' => 'getOlt',
         'position' => 'getPosition',
         'client_id' => 'getClientId',
@@ -286,6 +291,7 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         $this->container['traffic_profile_out'] = isset($data['traffic_profile_out']) ? $data['traffic_profile_out'] : null;
         $this->container['traffic_profile_in'] = isset($data['traffic_profile_in']) ? $data['traffic_profile_in'] : null;
         $this->container['catv'] = isset($data['catv']) ? $data['catv'] : null;
+        $this->container['voip'] = isset($data['voip']) ? $data['voip'] : null;
         $this->container['olt'] = isset($data['olt']) ? $data['olt'] : null;
         $this->container['position'] = isset($data['position']) ? $data['position'] : null;
         $this->container['client_id'] = isset($data['client_id']) ? $data['client_id'] : null;
@@ -701,6 +707,30 @@ class ONUCRUD implements ModelInterface, ArrayAccess
         return $this;
     }
 
+    /**
+     * Gets voip
+     *
+     * @return boolean
+     */
+    public function getVoip()
+    {
+        return $this->container['voip'];
+    }
+
+    /**
+     * Sets catv
+     *
+     * @param boolean $voip Si esta en 1 significa que posee voip.
+     *
+     * @return $this
+     */
+    public function setVoip($voip)
+    {
+        $this->container['voip'] = $voip;
+
+        return $this;
+    }
+
     /**
      * Gets olt
      *

src/Swagger/Client/FTTH/Model/ONUTemplate.php

@@ -70,6 +70,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         'onu_profile' => '\Swagger\Client\FTTH\Model\ONUProfile',
         'base' => 'int',
         'catv' => 'boolean',
+        'voip' => 'boolean',
         'tenancy_id' => 'int'
     ];
 
@@ -91,6 +92,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         'onu_profile' => null,
         'base' => null,
         'catv' => null,
+        'voip' => null,
         'tenancy_id' => null
     ];
 
@@ -133,6 +135,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         'onu_profile' => 'onuProfile',
         'base' => 'base',
         'catv' => 'catv',
+        'voip' => 'voip',
         'tenancy_id' => 'tenancyId'
     ];
 
@@ -154,6 +157,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         'onu_profile' => 'setOnuProfile',
         'base' => 'setBase',
         'catv' => 'setCatv',
+        'voip' => 'setVoip',
         'tenancy_id' => 'setTenancyId'
     ];
 
@@ -175,6 +179,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         'onu_profile' => 'getOnuProfile',
         'base' => 'getBase',
         'catv' => 'getCatv',
+        'voip' => 'setVoip',
         'tenancy_id' => 'getTenancyId'
     ];
 
@@ -247,6 +252,7 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         $this->container['onu_profile'] = isset($data['onu_profile']) ? $data['onu_profile'] : null;
         $this->container['base'] = isset($data['base']) ? $data['base'] : null;
         $this->container['catv'] = isset($data['catv']) ? $data['catv'] : null;
+        $this->container['voip'] = isset($data['voip']) ? $data['voip'] : null;
         $this->container['tenancy_id'] = isset($data['tenancy_id']) ? $data['tenancy_id'] : null;
     }
 
@@ -562,6 +568,30 @@ class ONUTemplate implements ModelInterface, ArrayAccess
         return $this;
     }
 
+    /**
+     * Gets voip
+     *
+     * @return int
+     */
+    public function getVoip()
+    {
+        return $this->container['voip'];
+    }
+
+    /**
+     * Sets catv
+     *
+     * @param int $voip Si esta en 1 significa que posee voip.
+     *
+     * @return $this
+     */
+    public function setVoip($voip)
+    {
+        $this->container['voip'] = $voip;
+
+        return $this;
+    }
+
     /**
      * Gets tenancy_id
      *

src/Swagger/Client/FTTH/Services.php

@@ -616,8 +616,9 @@ class Services extends ApiServices
                     $trafficProfileOut = $ch->integer($request, "trafficProfileOut", false);
                     $trafficProfileIn = $ch->integer($request, "trafficProfileIn", false);
                     $catv = $ch->boolean($request, "catv", false);
+                    $voip = $ch->boolean($request, "voip", false);
                     $content = "[";
-                    $result = $apiInstance->getList($id, $clientId, $ponSerialNumber, $currentState, $profile, $nap, $onuProfile, $vlanProfile, $model, $serialNumber, $ponSerialNumberAux, $position, $ip, $mac, $vlan, $trafficProfileOut, $trafficProfileIn, $catv, $olt, $tenancyId, $qb_criteria, $limit, $page);
+                    $result = $apiInstance->getList($id, $clientId, $ponSerialNumber, $currentState, $profile, $nap, $onuProfile, $vlanProfile, $model, $serialNumber, $ponSerialNumberAux, $position, $ip, $mac, $vlan, $trafficProfileOut, $trafficProfileIn, $catv, $voip, $olt, $tenancyId, $qb_criteria, $limit, $page);
                     foreach ($result as $v) {
                         // se eliminan los null
                         $content .= $v->__toString() . ",";
@@ -749,6 +750,12 @@ class Services extends ApiServices
                                     $instance->setCatv($onuTemplate->getCatv());
                                 }
                             }
+                            if (is_null($instance->getVoip()) || !is_bool($instance->getVoip())) {
+                                // catv = true or false
+                                if (!is_null($onuTemplate->getVoip()))  {
+                                    $instance->setVoip($onuTemplate->getVoip());
+                                }
+                            }
                         }
                     }
                     // chequeo la tenencia
@@ -845,6 +852,11 @@ class Services extends ApiServices
                                                                             $content = "El CATV deber ser true or false.";
                                                                         }
                                                                     }
+                                                                    if (!is_null($instance->getVoip())) {
+                                                                        if (!is_bool($instance->getVoip())) {
+                                                                            $content = "El VoIP deber ser true or false.";
+                                                                        }
+                                                                    }
                                                                     if (is_null($content)) {
                                                                         //print_r($instance);
                                                                         //die;
@@ -1597,10 +1609,11 @@ class Services extends ApiServices
                     $onuProfile = $ch->integer($request, "onuProfile", false);
                     $base = $ch->integer($request, "base", false);
                     $catv = $ch->integer($request, "catv", false);
+                    $voip = $ch->integer($request, "voip", false);
                     $tenancyId = $ch->integer($request, "tenancyId", false);
                     $qb_criteria = $ch->integer($request, "qb-criteria", false, null);
                     $content = "[";
-                    $result = $apiInstance->getList($id, $model, $profile, $tcontprofile, $trafficProfileIn, $trafficProfileOut, $vlan, $vlanProfile, $onuProfile, $base, $catv, $tenancyId, $qb_criteria, $limit, $page);
+                    $result = $apiInstance->getList($id, $model, $profile, $tcontprofile, $trafficProfileIn, $trafficProfileOut, $vlan, $vlanProfile, $onuProfile, $base, $catv, $voip, $tenancyId, $qb_criteria, $limit, $page);
                     foreach ($result as $v) {
                         // se eliminan los null
                         $content .= $v->__toString() . ",";