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

use cur_inet_addr_id from packets.csv

Browse Source
This commit is contained in:
Michael Hoennig 2024-07-19 12:03:00 +02:00
parent 7725329d43
commit 7775491f6f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java
View File

@ -130,10 +130,10 @@ public class ImportHostingAssets extends ImportOfficeData {
assertThat(firstOfEachType(5, IPV4_NUMBER)).isEqualToIgnoringWhitespace(""" assertThat(firstOfEachType(5, IPV4_NUMBER)).isEqualToIgnoringWhitespace("""
{ {
1000363=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.34), 1000363=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.34),
1000381=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.52),
1000402=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.73), 1000402=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.73),
1000433=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.104), 1000433=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.104),
1000473=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.144), 1000457=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.128)
1000574=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.245)
} }
"""); """);
} }
@ -278,10 +278,10 @@ public class ImportHostingAssets extends ImportOfficeData {
bookingItems.forEach(this::persistRecursively); bookingItems.forEach(this::persistRecursively);
}).assertSuccessful(); }).assertSuccessful();
persistHostingAssetsOfType(IPV4_NUMBER);
persistHostingAssetsOfType(CLOUD_SERVER); persistHostingAssetsOfType(CLOUD_SERVER);
persistHostingAssetsOfType(MANAGED_SERVER); persistHostingAssetsOfType(MANAGED_SERVER);
persistHostingAssetsOfType(MANAGED_WEBSPACE); persistHostingAssetsOfType(MANAGED_WEBSPACE);
persistHostingAssetsOfType(IPV4_NUMBER);
} }
private void persistRecursively(final Integer key, final HsBookingItemEntity bi) { private void persistRecursively(final Integer key, final HsBookingItemEntity bi) {
@ -352,7 +352,7 @@ public class ImportHostingAssets extends ImportOfficeData {
final var hive_id = rec.getInteger("hive_id"); final var hive_id = rec.getInteger("hive_id");
final var created = rec.getLocalDate("created"); final var created = rec.getLocalDate("created");
final var cancelled = rec.getLocalDate("cancelled"); final var cancelled = rec.getLocalDate("cancelled");
final var cur_inet_addr_id = rec.getInteger("cur_inet_addr_id"); // FIXME: import MANAGED_WEBSPACE final var cur_inet_addr_id = rec.getInteger("cur_inet_addr_id");
final var old_inet_addr_id = rec.getInteger("old_inet_addr_id"); // FIXME: assert that null final var old_inet_addr_id = rec.getInteger("old_inet_addr_id"); // FIXME: assert that null
final var free = rec.getBoolean("free"); // FIXME: assert that "free webspace => in customer managed server", otherwise ignore final var free = rec.getBoolean("free"); // FIXME: assert that "free webspace => in customer managed server", otherwise ignore
@ -377,6 +377,10 @@ public class ImportHostingAssets extends ImportOfficeData {
if (haType == MANAGED_SERVER) { if (haType == MANAGED_SERVER) {
hive(hive_id).serverRef.set(asset); hive(hive_id).serverRef.set(asset);
} }
if (cur_inet_addr_id != null) {
ipNumber(cur_inet_addr_id).setAssignedToAsset(asset);
}
}); });
// once we know all hosting assets, we can set the parentAsset for managed webspaces // once we know all hosting assets, we can set the parentAsset for managed webspaces

2
src/test/resources/migration/hosting/inet_addr.csv
View File

@ -1,7 +1,9 @@
inet_addr_id;inet_addr;description inet_addr_id;inet_addr;description
363;83.223.95.34; 363;83.223.95.34;
381;83.223.95.52;
402;83.223.95.73; 402;83.223.95.73;
433;83.223.95.104; 433;83.223.95.104;
457;83.223.95.128;
473;83.223.95.144; 473;83.223.95.144;
574;83.223.95.245; 574;83.223.95.245;
1168;83.223.79.72; 1168;83.223.79.72;

1 inet_addr_id inet_addr description
2 363 83.223.95.34
3 381 83.223.95.52
4 402 83.223.95.73
5 433 83.223.95.104
6 457 83.223.95.128
7 473 83.223.95.144
8 574 83.223.95.245
9 1168 83.223.79.72