Merge branch 'master' of https://bitbucket.org/ikflowdat/dhcp

app/config/bundles/ik/device-bundle/parameters.yml.dist

@@ -3,3 +3,7 @@ parameters:
     device_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices.json'
     device_delete_post_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
     device_put_url: 'http://127.0.0.1/base/app_dev.php/api/devices/'
+    api_device_check_url: 'http://base:80/api/devices/check.json'
+    api_device_post_url: 'http://base:80/api/devices.json'
+    api_device_delete_post_url: 'http://base:80/api/devices/'
+    api_device_put_url: 'http://base:80/api/devices/'

app/config/bundles/ik/device-bundle/parameters.yml.docker

@@ -4,3 +4,7 @@ parameters:
     device_post_url: 'http://%env(HOST_BASE)%/api/devices.json'
     device_delete_post_url: 'http://%env(HOST_BASE)%/api/devices/'
     device_put_url: 'http://%env(HOST_BASE)%/api/devices/'
+    api_device_check_url: 'http://base:80/api/devices/check.json'
+    api_device_post_url: 'http://base:80/api/devices.json'
+    api_device_delete_post_url: 'http://base:80/api/devices/'
+    api_device_put_url: 'http://base:80/api/devices/'

app/config/bundles/ik/device-bundle/parameters.yml.drone

@@ -3,4 +3,8 @@ parameters:
    device_post_url: 'http://device.post.url/base/app_dev.php/api/devices.json'
    device_delete_post_url: 'http://device.delete.post.url/base/app_dev.php/api/devices/'
    device_put_url: 'http://device.put.url/base/app_dev.php/api/devices/'
+   api_device_check_url: 'http://base:80/api/devices/check.json'
+   api_device_post_url: 'http://base:80/api/devices.json'
+   api_device_delete_post_url: 'http://base:80/api/devices/'
+   api_device_put_url: 'http://base:80/api/devices/'
  

composer.lock

@@ -1442,7 +1442,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "8f28559950fc4e12a96a97084057111fb97156e9"
+                "reference": "67612309a0afd5d2935dfb8a4bfb9da479a61361"
             },
             "type": "library",
             "autoload": {
@@ -1457,7 +1457,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2018-02-19T12:38:29+00:00"
+            "time": "2018-05-15T18:25:14+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1488,7 +1488,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "3332f266c84c9b6c9ba8e3bb17fef6aa7d7fdccd"
+                "reference": "92e389263fa941ed35eeb54e7520bc1ccccc4ce7"
             },
             "type": "library",
             "autoload": {
@@ -1503,7 +1503,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-02-19T11:30:09+00:00"
+            "time": "2018-05-11T17:07:59+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1607,7 +1607,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/TemplateBundle.git",
-                "reference": "69e6761d6f3d3e9f85f5a43b72324f3d56dce4de"
+                "reference": "14e7b7c9d0deadf8c779874419cf2f183a02bbf8"
             },
             "require": {
                 "ik/base-admin-bundle": "*"
@@ -1625,7 +1625,7 @@
                 "bundle",
                 "template"
             ],
-            "time": "2018-04-04T17:49:43+00:00"
+            "time": "2018-04-24T15:29:11+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1654,7 +1654,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "02e9a07ebe7c40417f4e78c451e26a893abc9164"
+                "reference": "bd577e702f687cceafb370131d60916ecc2b6976"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1684,7 +1684,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-04-05T14:41:00+00:00"
+            "time": "2018-04-25T14:53:54+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/DHCPBundle/Resources/translations/DHCPBundle.es.yml

@@ -7,6 +7,7 @@ form:
     label_user: Usuario
     label_password: Password
     label_dhcp_model: Modelo DHCP
+    label_extra_data: Extra Data
 
 breadcrumb:
     link_d_h_c_p_list: Listado DHCP
@@ -21,6 +22,7 @@ list:
     label_password: Password
     label__action: Acciones
     label_dhcp_model: Modelo DHCP
+    label_extra_data: Extra Data
 
 show:
     label_name: Nombre
@@ -28,6 +30,7 @@ show:
     label_user: Usuario
     label_password: Password
     label_dhcp_model: Modelo DHCP
+    label_extra_data: Extra Data
 
 filter:
     label_name: Nombre

src/IPv4Bundle/Resources/translations/IPv4Bundle.es.yml

@@ -38,6 +38,7 @@ form:
     label_option122_dhcp_server_secondary: Option122 Dhcp Server Secondary
     label_option122_provisioning_server: Option122 Provisioning Server
     label_option122_provisioning_type: Option122 Provisioning Type
+    label_extra_data: Extra Data
 
 list:
     label_mac: Mac
@@ -56,6 +57,7 @@ list:
     label_net_group: Grupo de red
     label_ip_pool: IP Pool
     label_state: Estado
+    label_extra_data: Extra Data
 
 show:
     label_mac: Mac
@@ -89,6 +91,7 @@ show:
     label_option122_dhcp_server_secondary: Option122 Dhcp Server Secondary
     label_option122_provisioning_server: Option122 Provisioning Server
     label_option122_provisioning_type: Option122 Provisioning Type
+    label_extra_data: Extra Data
 
 filter:
     label_mac: Mac
@@ -101,6 +104,7 @@ filter:
     label_address: Dirección
     label_options: Opciones
     label_state: Estado
+    label_extra_data: Extra Data
 
 breadcrumb:
     link_host_list: Listado Host

src/KeaBundle/Services/BaseKea.php

@@ -41,7 +41,7 @@ class BaseKea implements KeaConfigInterface
                 'hooks-libraries' => $this->hooks_libraries,
             ],
             'Logging' => $this->loggingConfig(),
-        ], JSON_PRETTY_PRINT);
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
     }
 
     /**