add-ipnumber-validatation #77
@ -1,7 +1,7 @@
|
|||||||
## HostingAsset Type Structure
|
## HostingAsset Type Structure
|
||||||
|
|
||||||
|
|
||||||
### Webspace+Server
|
### Server+Webspace
|
||||||
|
|
||||||
```plantuml
|
```plantuml
|
||||||
@startuml
|
@startuml
|
||||||
@ -22,6 +22,12 @@ package Hosting #feb28c{
|
|||||||
entity HA_IPV6_NUMBER
|
entity HA_IPV6_NUMBER
|
||||||
}
|
}
|
||||||
|
|
||||||
|
package Webspace #99bcdb {
|
||||||
|
entity HA_MANAGED_WEBSPACE
|
||||||
|
entity HA_UNIX_USER
|
||||||
|
entity HA_EMAIL_ALIAS
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BI_CLOUD_SERVER *--> BI_PRIVATE_CLOUD
|
BI_CLOUD_SERVER *--> BI_PRIVATE_CLOUD
|
||||||
@ -30,10 +36,16 @@ BI_MANAGED_WEBSPACE *--> BI_MANAGED_SERVER
|
|||||||
|
|
||||||
HA_CLOUD_SERVER *==> BI_CLOUD_SERVER
|
HA_CLOUD_SERVER *==> BI_CLOUD_SERVER
|
||||||
HA_MANAGED_SERVER *==> BI_MANAGED_SERVER
|
HA_MANAGED_SERVER *==> BI_MANAGED_SERVER
|
||||||
|
HA_MANAGED_WEBSPACE *==> BI_MANAGED_WEBSPACE
|
||||||
|
HA_MANAGED_WEBSPACE o..> HA_MANAGED_SERVER
|
||||||
|
HA_UNIX_USER *==> HA_MANAGED_WEBSPACE
|
||||||
|
HA_EMAIL_ALIAS *==> HA_MANAGED_WEBSPACE
|
||||||
HA_IPV4_NUMBER o..> HA_CLOUD_SERVER
|
HA_IPV4_NUMBER o..> HA_CLOUD_SERVER
|
||||||
HA_IPV4_NUMBER o..> HA_MANAGED_SERVER
|
HA_IPV4_NUMBER o..> HA_MANAGED_SERVER
|
||||||
|
HA_IPV4_NUMBER o..> HA_MANAGED_WEBSPACE
|
||||||
HA_IPV6_NUMBER o..> HA_CLOUD_SERVER
|
HA_IPV6_NUMBER o..> HA_CLOUD_SERVER
|
||||||
HA_IPV6_NUMBER o..> HA_MANAGED_SERVER
|
HA_IPV6_NUMBER o..> HA_MANAGED_SERVER
|
||||||
|
HA_IPV6_NUMBER o..> HA_MANAGED_WEBSPACE
|
||||||
|
|
||||||
package Legend #white {
|
package Legend #white {
|
||||||
SUB_ENTITY1 *--> REQUIRED_PARENT_ENTITY
|
SUB_ENTITY1 *--> REQUIRED_PARENT_ENTITY
|
||||||
|
@ -30,7 +30,7 @@ public enum HsBookingItemType implements Node {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean belongsToAny(final Set<String> groups) {
|
public boolean belongsToAny(final Set<String> groups) {
|
||||||
return true;
|
return true; // we currently do not filter booking item types
|
||||||
hsh-michaelhoennig marked this conversation as resolved
Outdated
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -316,7 +316,7 @@ public enum HsHostingAssetType implements Node {
|
|||||||
.collect(toSet()));
|
.collect(toSet()));
|
||||||
|
|
||||||
markdown
|
markdown
|
||||||
.append(renderAsPlantUML("Webspace+Server", Set.of("Server")))
|
.append(renderAsPlantUML("Server+Webspace", Set.of("Server", "Webspace")))
|
||||||
hsh-michaelhoennig marked this conversation as resolved
Outdated
hsh-marcsandlus
commented
-Webspace -Webspace
|
|||||||
.append(renderAsPlantUML("Domain", Set.of("Domain", "Webspace")))
|
.append(renderAsPlantUML("Domain", Set.of("Domain", "Webspace")))
|
||||||
.append(renderAsPlantUML("MariaDB", Set.of("MariaDB", "Webspace")))
|
.append(renderAsPlantUML("MariaDB", Set.of("MariaDB", "Webspace")))
|
||||||
.append(renderAsPlantUML("PostgreSQL", Set.of("PostgreSQL", "Webspace")));
|
.append(renderAsPlantUML("PostgreSQL", Set.of("PostgreSQL", "Webspace")));
|
||||||
|
@ -511,7 +511,7 @@ public class HsHostingAssetControllerRestTest {
|
|||||||
IPV6_NUMBER(
|
IPV6_NUMBER(
|
||||||
List.of(
|
List.of(
|
||||||
HsHostingAssetEntity.builder()
|
HsHostingAssetEntity.builder()
|
||||||
.type(HsHostingAssetType.IPV4_NUMBER)
|
.type(HsHostingAssetType.IPV6_NUMBER)
|
||||||
hsh-michaelhoennig marked this conversation as resolved
Outdated
hsh-marcsandlus
commented
IPV6 IPV6
|
|||||||
.assignedToAsset(TEST_MANAGED_SERVER_HOSTING_ASSET)
|
.assignedToAsset(TEST_MANAGED_SERVER_HOSTING_ASSET)
|
||||||
.identifier("2001:db8:3333:4444:5555:6666:7777:8888")
|
.identifier("2001:db8:3333:4444:5555:6666:7777:8888")
|
||||||
.caption("some fake IPv6 number")
|
.caption("some fake IPv6 number")
|
||||||
@ -519,7 +519,7 @@ public class HsHostingAssetControllerRestTest {
|
|||||||
"""
|
"""
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"type": "IPV4_NUMBER",
|
"type": "IPV6_NUMBER",
|
||||||
"identifier": "2001:db8:3333:4444:5555:6666:7777:8888",
|
"identifier": "2001:db8:3333:4444:5555:6666:7777:8888",
|
||||||
"caption": "some fake IPv6 number",
|
"caption": "some fake IPv6 number",
|
||||||
"alarmContact": null,
|
"alarmContact": null,
|
||||||
|
Loading…
Reference in New Issue
Block a user
contains