hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

add-ipnumber-validatation #77

Merged
hsh-michaelhoennig merged 4 commits from add-ipnumber-validatation into master 2024-07-16 10:32:41 +02:00
Conversation 0 Commits 4 Files Changed 18 +17 -5
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 654815c6a0 - Show all commits

14
doc/hs-hosting-asset-type-structure.md
View File

@ -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

2
src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemType.java
View File

@ -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
} }
@Override @Override

2
src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetType.java
View File

@ -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")))
.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")));

4
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerRestTest.java
View File

@ -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)
.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,