From 7775491f6f3bdc620903c04b3d2aa6e671360038 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 19 Jul 2024 12:03:00 +0200 Subject: [PATCH] use cur_inet_addr_id from packets.csv --- .../hsadminng/hs/migration/ImportHostingAssets.java | 12 ++++++++---- src/test/resources/migration/hosting/inet_addr.csv | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java index 9c3c67df..dda271f2 100644 --- a/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java +++ b/src/test/java/net/hostsharing/hsadminng/hs/migration/ImportHostingAssets.java @@ -130,10 +130,10 @@ public class ImportHostingAssets extends ImportOfficeData { assertThat(firstOfEachType(5, IPV4_NUMBER)).isEqualToIgnoringWhitespace(""" { 1000363=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.34), + 1000381=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.52), 1000402=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.73), 1000433=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.104), - 1000473=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.144), - 1000574=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.245) + 1000457=HsHostingAssetEntity(IPV4_NUMBER, 83.223.95.128) } """); } @@ -278,10 +278,10 @@ public class ImportHostingAssets extends ImportOfficeData { bookingItems.forEach(this::persistRecursively); }).assertSuccessful(); - persistHostingAssetsOfType(IPV4_NUMBER); persistHostingAssetsOfType(CLOUD_SERVER); persistHostingAssetsOfType(MANAGED_SERVER); persistHostingAssetsOfType(MANAGED_WEBSPACE); + persistHostingAssetsOfType(IPV4_NUMBER); } 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 created = rec.getLocalDate("created"); 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 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) { 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 diff --git a/src/test/resources/migration/hosting/inet_addr.csv b/src/test/resources/migration/hosting/inet_addr.csv index fe66e1b8..15bab1fb 100644 --- a/src/test/resources/migration/hosting/inet_addr.csv +++ b/src/test/resources/migration/hosting/inet_addr.csv @@ -1,7 +1,9 @@ inet_addr_id;inet_addr;description 363;83.223.95.34; +381;83.223.95.52; 402;83.223.95.73; 433;83.223.95.104; +457;83.223.95.128; 473;83.223.95.144; 574;83.223.95.245; 1168;83.223.79.72;