Merged FD3-633 into master

app/config/import_data.yml

@@ -0,0 +1,51 @@
+HostType:
+    source_table: "HostType"
+    destination_table: "host_type"
+    mapping:
+        id: id
+        name: name
+        shortname: shortname
+
+Host:
+    source_table: "Host"
+    destination_table: "host"
+    mapping:
+        id: id
+        host_type_id: host_type_id
+        mac: mac
+        options: options
+
+NetGroup:
+    source_table: "NetGroup"
+    destination_table: "net_group"
+    mapping:
+        id: id
+        name: name
+        opcode: opcode
+        tenancy_id: tenancy_id
+
+
+SubNet:
+    source_table: "SubNet"
+    destination_table: "sub_net"
+    mapping:
+        id: id
+        allowed_host_type_id: allowed_host_type_id
+        net_group_id: net_group_id
+        address: address
+        options: options
+        tenancy_id: tenancy_id
+
+
+Pool:
+    source_table: "Pool"
+    destination_table: "pool"
+    mapping:
+        id: id
+        sub_net_id: sub_net_id
+        name: name
+        first_ip: first_ip
+        last_ip: last_ip
+        priority: priority
+        is_static: is_static
+        tenancy_id: tenancy_id

app/config/import_data_kea.yml

@@ -0,0 +1,8 @@
+Leases4:
+    source_table: "lease"
+    destination_table: "lease4"
+    mapping:
+        address: ipint
+        hwaddr: hw_address
+        hostname: hostname
+        expire: ends

app/config/parameters.yml.dist

@@ -2,6 +2,7 @@
 # Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
 # http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 parameters:
+    database_driver: pdo_mysql
     database_host: mysql
     database_port: ~
     database_name: fd3_dhcp

composer.lock

@@ -1,7 +1,7 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
     "content-hash": "69f6e49150898ee6c8362eba1b9d19f5",
@@ -1457,7 +1457,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "35f959bb88cbb5700c5cd258c32178c4b432c0ee"
+                "reference": "d6dfe3b8c1b961c64766680c4a58db45af7e684d"
             },
             "type": "library",
             "autoload": {
@@ -1472,7 +1472,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-07-20T16:02:59+00:00"
+            "time": "2018-07-27T16:52:57+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6282,7 +6282,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },