From d16a030ea65b19e09c031700314d25f3352587d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20H=C3=B6ck?= <hoeck@atis.uka.de>
Date: Fri, 4 Sep 2020 00:24:39 +0200
Subject: [PATCH] UPD: repaired API calls for DHCPVS
---
frontend/src/api-services/dhcp.service.js | 17 ++++++++---------
frontend/src/views/dhcpvs/bcd_dhcp_overview.vue | 8 ++++----
frontend/src/views/dhcpvs/bcd_dhcp_settings.vue | 11 +++--------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/frontend/src/api-services/dhcp.service.js b/frontend/src/api-services/dhcp.service.js
index d98032ec8..cf6853133 100644
--- a/frontend/src/api-services/dhcp.service.js
+++ b/frontend/src/api-services/dhcp.service.js
@@ -1,13 +1,12 @@
import TransactionService from './transaction.service'
export default {
-
getOverviewDHCP(config) {
let ta = [
{"name": "nd.bcd.list", "old": {"is_own": true, "sorting_params_list": "[\"name\"]"}},
- {"name": "vw.ou.list", "join": {"0": "nd.bcd.fkey_nd_bcd_oe"}},
- {"name": "nd.ip_subnet.list", "join": {"0": "nd.ip_subnet.fkey_nd_ip_subnet_bcd"}, "old": { "type": 4}},
- {"name": "nd.vlan.list", "join": {"0": "nd.vlan.fkey_nd_vlan_bcd"}}
+ {"name": "org.unit.list", "join": {"0": "api_fkey_nd_bcd_oe"}},
+ {"name": "nd.ip_subnet.list", "join": {"0": "api_fkey_nd_ip_subnet_bcd"}, "old":{"type":4}},
+ {"name": "nd.vlan.list", "join": {"0": "api_fkey_nd_vlan_bcd"}},
]
return TransactionService.execute(config, ta);
},
@@ -15,8 +14,8 @@ export default {
getDetailDHCP(config, name) {
let ta = [
{"name": "nd.bcd.list", "old": {"name_list": "[\"" + name + "\"]"}},
- {"name": "nd.ip_subnet.list", "join": {"0": "nd.ip_subnet.fkey_nd_ip_subnet_bcd"}, "old": { "type": 4}},
- {"name": "nd.vlan.list", "join": {"0": "nd.vlan.fkey_nd_vlan_bcd"}}
+ {"name": "nd.ip_subnet.list", "join": {"0": "api_fkey_nd_ip_subnet_bcd"}, "old": { "type": 4}},
+ {"name": "nd.vlan.list", "join": {"0": "api_fkey_nd_vlan_bcd"}}
]
return TransactionService.execute(config, ta);
},
@@ -24,7 +23,7 @@ export default {
getIPs(config, cidr) {
let ta = [
{"name": "dns.ip_addr.list", "old": {"type": 4, "sorting_params_list": ['value'], "value_cidr": cidr, "is_dhcp": true}},
- {"name": "dns.record.list", "old": {"type": "A"} , "join": {"0": "dns.record.fkey_pdns_rr_addr"}}
+ {"name": "dns.record.list", "old": {"type": "A"} , "join": {"0": "api_fkey_dns_record_target_ipaddr"}}
]
return TransactionService.execute(config, ta);
},
@@ -32,8 +31,8 @@ export default {
getLeases(config, cidr) {
let ta = [
{"name": "dhcp.lease.list", "old": {"ip_subnet_cidr": cidr}},
- {"name": "dns.ip_addr.list", "join": {"0": "dhcp.lease.fkey_dhcp_lease_addr"}},
- {"name": "dns.record.list", "join": {"1": "dns.record.fkey_pdns_rr_addr"}}
+ {"name": "dns.ip_addr.list", "join": {"0": "api_fkey_dhcp_lease_addr"}},
+ {"name": "dns.record.list", "join": {"1": "api_fkey_dns_record_target_ipaddr"}}
]
return TransactionService.execute(config, ta);
}
diff --git a/frontend/src/views/dhcpvs/bcd_dhcp_overview.vue b/frontend/src/views/dhcpvs/bcd_dhcp_overview.vue
index 1d9b9a1b7..1e32eefea 100755
--- a/frontend/src/views/dhcpvs/bcd_dhcp_overview.vue
+++ b/frontend/src/views/dhcpvs/bcd_dhcp_overview.vue
@@ -24,18 +24,18 @@
<table class="table table-striped">
<thead>
<tr>
- <th>{{ $colnames['DBNetArea']['name'].short_title_abs }} <a class="sort d-print-none"><i
+ <th>Name <a class="sort d-print-none"><i
class="fas fa-sort"></i></a></th>
- <th>{{ $colnames['DBNetArea']['description'].short_title_abs }} <a class="sort d-print-none"><i
+ <th>Beschreibung <a class="sort d-print-none"><i
class="fas fa-sort"></i></a></th>
- <th>{{ $colnames['Net']['net'].short_title_abs }} <a class="sort d-print-none"><i
+ <th>IP-Subnetz <a class="sort d-print-none"><i
class="fas fa-sort"></i></a>
</th>
<th>DHCP Aktiviert <a class="sort d-print-none" data-order="" data-target="utilization"><i
class="fas fa-sort"></i></a></th>
<th>Anzahl DHCP Adressen <a class="sort d-print-none" data-order="" data-target="utilization"><i
class="fas fa-sort"></i></a></th>
- <th>{{ $colnames['Facility']['name'].short_title_abs }} <a class="sort d-print-none"><i
+ <th>Organistationseinheit <a class="sort d-print-none"><i
class="fas fa-sort-up"></i></a></th>
<th>BCD (VLAN-Liste) <a class="sort"><i
class="fas fa-sort"></i></a></th>
diff --git a/frontend/src/views/dhcpvs/bcd_dhcp_settings.vue b/frontend/src/views/dhcpvs/bcd_dhcp_settings.vue
index b9ffd8556..c769460aa 100644
--- a/frontend/src/views/dhcpvs/bcd_dhcp_settings.vue
+++ b/frontend/src/views/dhcpvs/bcd_dhcp_settings.vue
@@ -21,22 +21,17 @@
<div class="card-header">Bereich</div>
<table class="table address-table" style="margin: 0">
<tr>
- <th :title="$colnames['DBNetArea']['name'].long_title">{{
- $colnames['DBNetArea']['name'].short_title_abs }}
- </th>
+ <th>Name</th>
<td colspan="2">{{ bcd.name }}</td>
</tr>
<tr>
- <th :title="$colnames['Facility']['short_name'].long_title">{{
- $colnames['Facility']['short_name'].short_title_abs }}
+ <th>Vollständiger Name
</th>
<td colspan="2" :title="bcd.ou_short_name">{{ bcd.ou_short_name }}
</td>
</tr>
<tr>
- <th :title="$colnames['Net']['net'].long_title">{{
- $colnames['Net']['net'].short_title_abs }}
- </th>
+ <th>Subnetze</th>
<td colspan="2">
<div v-if="range">
<div v-for="IPRange in range" :key="IPRange.cidr">
--
GitLab