Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
scc-net
netvs
netvs-core
Commits
d16a030e
Commit
d16a030e
authored
Sep 04, 2020
by
Malte Höck
Browse files
UPD: repaired API calls for DHCPVS
parent
9608771e
Pipeline
#108031
failed with stages
in 1 minute and 53 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
frontend/src/api-services/dhcp.service.js
View file @
d16a030e
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_ip
addr
"
}}
]
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_ip
addr
"
}}
]
return
TransactionService
.
execute
(
config
,
ta
);
}
...
...
frontend/src/views/dhcpvs/bcd_dhcp_overview.vue
View file @
d16a030e
...
...
@@ -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>
...
...
frontend/src/views/dhcpvs/bcd_dhcp_settings.vue
View file @
d16a030e
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment