Fixing VM folder for existing VMs

diff --git a/lib/create_terraform/handler/__init__.py b/lib/create_terraform/handler/__init__.py
index f1d1f3eac52841f30cfb008167bac32758ca27dd..ec405978131f1003e06123c8018ab1ac182caf8f 100644 (file)
--- a/lib/create_terraform/handler/__init__.py
+++ b/lib/create_terraform/handler/__init__.py
@@ -46,7 +46,7 @@ from ..errors import AbortExecution
 
 from ..xlate import XLATOR
 
-__version__ = '4.1.0'
+__version__ = '4.1.1'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext

diff --git a/lib/create_terraform/handler/vmware.py b/lib/create_terraform/handler/vmware.py
index 3fc514df70da79818f8b68419fac4e9ffdad56a2..f24a73042e72118913700771e97bece8b107754a 100644 (file)
--- a/lib/create_terraform/handler/vmware.py
+++ b/lib/create_terraform/handler/vmware.py
@@ -33,7 +33,7 @@ from ..slim_vm import SlimVm
 
 from ..xlate import XLATOR
 
-__version__ = '0.3.2'
+__version__ = '1.0.0'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -638,6 +638,18 @@ class CrTfHandlerVmwMixin():
                 vm.datastore = ds
                 vm.already_existing = True
                 vm.vsphere = vsphere_name
+
+                if existing_vm.path != vm.folder:
+                    msg = _(
+                        "{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located "
+                        "in folder '{cur_f}' instead in '{exp_f}'.").format(
+                        prefix=self.colored(_('CAUTION!'), 'YELLOW'),
+                        name=self.colored(vm.name, 'YELLOW'), vs=vsphere_name,
+                        cur_f=self.colored(existing_vm.path, 'YELLOW'),
+                        exp_f=self.colored(vm.folder, 'YELLOW'))
+                    print(msg)
+                    vm.folder = existing_vm.path
+
                 self.existing_vms.append(vm)
 
             else:

diff --git a/locale/create_terraform.pot b/locale/create_terraform.pot
index 555189eef5fd8e6963eab9de27ea94865f83007c..4c4246f9db34a34f9edfc2bcb19a0648f94350b9 100644 (file)
--- a/locale/create_terraform.pot
+++ b/locale/create_terraform.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-23 16:12+0200\n"
+"POT-Creation-Date: 2024-05-24 10:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <frank.brehm@pixelpark.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Executing {!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:491
+#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:500
 #: lib/create_terraform/handler/first.py:115
 msgid "Completed process:"
 msgstr ""
@@ -523,27 +523,27 @@ msgstr ""
 msgid "Importing existing virtual machines ..."
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:472
+#: lib/create_terraform/handler/__init__.py:476
 msgid "Importing VM {!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:489
+#: lib/create_terraform/handler/__init__.py:498
 msgid "Error on importing VM {!r}:"
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:511
+#: lib/create_terraform/handler/__init__.py:506
 msgid "Congratulations!"
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:513
+#: lib/create_terraform/handler/__init__.py:508
 msgid "Now you are ready to deploy the following virtual machines:"
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:517
+#: lib/create_terraform/handler/__init__.py:512
 msgid "To start the deployment process change to directory {}"
 msgstr ""
 
-#: lib/create_terraform/handler/__init__.py:520
+#: lib/create_terraform/handler/__init__.py:515
 msgid "and enter: {}"
 msgstr ""
 
@@ -1259,175 +1259,181 @@ msgstr ""
 msgid "Datastore of VM {vm!r}: {ds!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:657
+#: lib/create_terraform/handler/vmware.py:643
+msgid ""
+"{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located in folder '{cur_f}' "
+"instead in '{exp_f}'."
+msgstr ""
+
+#: lib/create_terraform/handler/vmware.py:646 lib/create_terraform/handler/vmware.py:670
 msgid "CAUTION!"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:661
+#: lib/create_terraform/handler/vmware.py:674
 msgid "Did not found any VM to deploy!"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:664
+#: lib/create_terraform/handler/vmware.py:677
 msgid "No VMs to deploy"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:680
+#: lib/create_terraform/handler/vmware.py:693
 msgid "Used datastore clusters:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:682
+#: lib/create_terraform/handler/vmware.py:695
 msgid "No datastore clusters are used."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:689
+#: lib/create_terraform/handler/vmware.py:702
 msgid "Used datastors:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:691
+#: lib/create_terraform/handler/vmware.py:704
 msgid "No datastores are used."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:696
+#: lib/create_terraform/handler/vmware.py:709
 msgid "Validating given datastore clusters of VMs ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:724
+#: lib/create_terraform/handler/vmware.py:737
 msgid "Found datastore cluster {c!r} in VSphere {v!r} for VM {n!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:728
+#: lib/create_terraform/handler/vmware.py:741
 msgid "Setting datastore cluster for VM {n!r} to {c!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:733
+#: lib/create_terraform/handler/vmware.py:746
 msgid "Free space of cluster {c!r} in VSphere {v!r} before provisioning: {a:0.1f} GiB."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:738
+#: lib/create_terraform/handler/vmware.py:751
 msgid ""
 "Datastore cluster {d!r} in VSphere {v!r} has not sufficient space for storage of VM {vm!r} "
 "(needed {n:0.1f} GiB, available {a:0.1f} GiB)."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:748
+#: lib/create_terraform/handler/vmware.py:761
 msgid "Free space in cluster {c!r} in VSphere {v!r} after provisioning: {a:0.1f} GiB."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:760
+#: lib/create_terraform/handler/vmware.py:773
 msgid "Datastore cluster {c!r} of VM {n!r} not found in VSphere {v!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:767
+#: lib/create_terraform/handler/vmware.py:780
 msgid "Validating given datastores of VMs and assign failing ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:773
+#: lib/create_terraform/handler/vmware.py:786
 msgid "Removing defined datastore {d!r} for VM {n!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:798 lib/create_terraform/handler/vmware.py:906
+#: lib/create_terraform/handler/vmware.py:811 lib/create_terraform/handler/vmware.py:919
 msgid "Did not found cluster object {c!r} for VM {n!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:808 lib/create_terraform/handler/vmware.py:843
+#: lib/create_terraform/handler/vmware.py:821 lib/create_terraform/handler/vmware.py:856
 msgid "Found datastore {d!r} for VM {n!r} in VSPhere {v!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:811
+#: lib/create_terraform/handler/vmware.py:824
 msgid "Datastore {d!r} not available in cluster {c!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:815
+#: lib/create_terraform/handler/vmware.py:828
 msgid "Setting datastore for VM {n!r} to {d!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:820
+#: lib/create_terraform/handler/vmware.py:833
 msgid ""
 "Datastore {d!r} has not sufficient space for storage of VM {v!r} (needed {n:0.1f} GiB, available"
 " {a:0.1f} GiB)."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:831
+#: lib/create_terraform/handler/vmware.py:844
 msgid "Datastore {d!r} of VM {n!r} not found in VSPhere {v!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:856
+#: lib/create_terraform/handler/vmware.py:869
 msgid "Validating interfaces of VMs and assign networks ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:861
+#: lib/create_terraform/handler/vmware.py:874
 msgid "Validated FQDNs:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:862
+#: lib/create_terraform/handler/vmware.py:875
 msgid "Validated Addresses:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:872
+#: lib/create_terraform/handler/vmware.py:885
 msgid "Used networks:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:878
+#: lib/create_terraform/handler/vmware.py:891
 msgid "Used forward DNS entries:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:884
+#: lib/create_terraform/handler/vmware.py:897
 msgid "Used reverse DNS entries:"
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:890
+#: lib/create_terraform/handler/vmware.py:903
 msgid "Checking interfaces of VM {n!r} in VSPhere {v!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:894
+#: lib/create_terraform/handler/vmware.py:907
 msgid "No interfaces defined for VM {!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:923
+#: lib/create_terraform/handler/vmware.py:936
 msgid "Checking interface {i} of VM {n!r} ..."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:927
+#: lib/create_terraform/handler/vmware.py:940
 msgid "Interface {i} of VM {n!r} has no defined address."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:933
+#: lib/create_terraform/handler/vmware.py:946
 msgid "Interface {i} of VM {n!r} has no defined FQDN."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:939
+#: lib/create_terraform/handler/vmware.py:952
 msgid "FQDN {f!r} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:951
+#: lib/create_terraform/handler/vmware.py:964
 msgid "IPv4 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:966
+#: lib/create_terraform/handler/vmware.py:979
 msgid "IPv6 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:982
+#: lib/create_terraform/handler/vmware.py:995
 msgid "Could not find network {n!r} for VM {v!r}, interface {i}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:994
+#: lib/create_terraform/handler/vmware.py:1007
 msgid "Found network {n!r} for interface {i} of VM {v!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:998
+#: lib/create_terraform/handler/vmware.py:1011
 msgid "Network {n!r} for interface {i} of VM {v!r} not available in cluster {c!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:1003
+#: lib/create_terraform/handler/vmware.py:1016
 msgid "Network {n!r} is available in cluster {c!r}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:1008
+#: lib/create_terraform/handler/vmware.py:1021
 msgid "Setting gateway of interface {i} of VM {v!r} to {g}."
 msgstr ""
 
-#: lib/create_terraform/handler/vmware.py:1034
+#: lib/create_terraform/handler/vmware.py:1047
 msgid "Ensuring existence of all necessary vSphere VM folders."
 msgstr ""
 

diff --git a/locale/de_DE/LC_MESSAGES/create_terraform.po b/locale/de_DE/LC_MESSAGES/create_terraform.po
index 4ba9c2159edc10a4b617543753098623260762ce..47035fbef664f3cf11b37d707f5fec0c17edbf21 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/create_terraform.po
+++ b/locale/de_DE/LC_MESSAGES/create_terraform.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-23 16:12+0200\n"
-"PO-Revision-Date: 2024-05-23 15:45+0200\n"
+"POT-Creation-Date: 2024-05-24 10:34+0200\n"
+"PO-Revision-Date: 2024-05-24 10:35+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: de_DE\n"
 "Language-Team: Frank Brehm <frank.brehm@pixelpark.com>\n"
@@ -529,7 +529,7 @@ msgstr "Und wie ich bereits sagte - es war nur eine Simulation!"
 msgid "Executing {!r} ..."
 msgstr "Führe {!r} aus …"
 
-#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:491
+#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:500
 #: lib/create_terraform/handler/first.py:115
 msgid "Completed process:"
 msgstr "Fertiggestellter Prozess:"
@@ -538,27 +538,27 @@ msgstr "Fertiggestellter Prozess:"
 msgid "Importing existing virtual machines ..."
 msgstr "Importiere Existierende virtuelle Maschinen …"
 
-#: lib/create_terraform/handler/__init__.py:472
+#: lib/create_terraform/handler/__init__.py:476
 msgid "Importing VM {!r}."
 msgstr "Importiere VM {!r}."
 
-#: lib/create_terraform/handler/__init__.py:489
+#: lib/create_terraform/handler/__init__.py:498
 msgid "Error on importing VM {!r}:"
 msgstr "Fehler beim Importieren der VM {!r}:"
 
-#: lib/create_terraform/handler/__init__.py:511
+#: lib/create_terraform/handler/__init__.py:506
 msgid "Congratulations!"
 msgstr "Herzlichen Glückwünschen!"
 
-#: lib/create_terraform/handler/__init__.py:513
+#: lib/create_terraform/handler/__init__.py:508
 msgid "Now you are ready to deploy the following virtual machines:"
 msgstr "Du bist jetzt bereit, die folgenden virtuelle Maschinen zu deployen:"
 
-#: lib/create_terraform/handler/__init__.py:517
+#: lib/create_terraform/handler/__init__.py:512
 msgid "To start the deployment process change to directory {}"
 msgstr "Um mit dem Deployment-Prozess zu beginnen, wechsle in das Verzeichnis {}"
 
-#: lib/create_terraform/handler/__init__.py:520
+#: lib/create_terraform/handler/__init__.py:515
 msgid "and enter: {}"
 msgstr "und gib ein: {}"
 
@@ -1280,51 +1280,57 @@ msgstr "Informationen zur VM:"
 msgid "Datastore of VM {vm!r}: {ds!r}."
 msgstr "Datastore der VM {vm!r}: {ds!r}."
 
-#: lib/create_terraform/handler/vmware.py:657
+#: lib/create_terraform/handler/vmware.py:643
+msgid ""
+"{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located in folder '{cur_f}' "
+"instead in '{exp_f}'."
+msgstr "Die existierende VM '{name}' in vSphere {vs!r} ist aktuell im Ordner '{cur_f}' anstelle von '{exp_f}' plaziert."
+
+#: lib/create_terraform/handler/vmware.py:646 lib/create_terraform/handler/vmware.py:670
 msgid "CAUTION!"
 msgstr "ACHTUNG!"
 
-#: lib/create_terraform/handler/vmware.py:661
+#: lib/create_terraform/handler/vmware.py:674
 msgid "Did not found any VM to deploy!"
 msgstr "Keine VM zum Deploy gefunden!"
 
-#: lib/create_terraform/handler/vmware.py:664
+#: lib/create_terraform/handler/vmware.py:677
 msgid "No VMs to deploy"
 msgstr "Keine VMs zu deployen"
 
-#: lib/create_terraform/handler/vmware.py:680
+#: lib/create_terraform/handler/vmware.py:693
 msgid "Used datastore clusters:"
 msgstr "Verwendete Datastore-Cluster:"
 
-#: lib/create_terraform/handler/vmware.py:682
+#: lib/create_terraform/handler/vmware.py:695
 msgid "No datastore clusters are used."
 msgstr "Es werden keine Datastore-Cluster verwendet."
 
-#: lib/create_terraform/handler/vmware.py:689
+#: lib/create_terraform/handler/vmware.py:702
 msgid "Used datastors:"
 msgstr "Verwendete Datastores:"
 
-#: lib/create_terraform/handler/vmware.py:691
+#: lib/create_terraform/handler/vmware.py:704
 msgid "No datastores are used."
 msgstr "Es werden keine Datastores verwendet."
 
-#: lib/create_terraform/handler/vmware.py:696
+#: lib/create_terraform/handler/vmware.py:709
 msgid "Validating given datastore clusters of VMs ..."
 msgstr "Validiere gegebene Datastore-Cluster der VMs …"
 
-#: lib/create_terraform/handler/vmware.py:724
+#: lib/create_terraform/handler/vmware.py:737
 msgid "Found datastore cluster {c!r} in VSphere {v!r} for VM {n!r}."
 msgstr "Fand Datastore-Cluster {c!r} in VSphere {v!r} für die VM {n!r}."
 
-#: lib/create_terraform/handler/vmware.py:728
+#: lib/create_terraform/handler/vmware.py:741
 msgid "Setting datastore cluster for VM {n!r} to {c!r} ..."
 msgstr "Setze Datastore-Cluster für VM {n!r} auf {c!r} …"
 
-#: lib/create_terraform/handler/vmware.py:733
+#: lib/create_terraform/handler/vmware.py:746
 msgid "Free space of cluster {c!r} in VSphere {v!r} before provisioning: {a:0.1f} GiB."
 msgstr "Freier Platz in Cluster {c!r} in VSphere {v!r} vor der Provisionierung: {a:0.1f} GiB."
 
-#: lib/create_terraform/handler/vmware.py:738
+#: lib/create_terraform/handler/vmware.py:751
 msgid ""
 "Datastore cluster {d!r} in VSphere {v!r} has not sufficient space for storage of VM {vm!r} "
 "(needed {n:0.1f} GiB, available {a:0.1f} GiB)."
@@ -1332,39 +1338,39 @@ msgstr ""
 "Der Datastore-Cluster {d!r} in VSphere {v!r} hat nicht genügend freien Platz für den Storage der"
 " VM {vm!r} (benötigt {n:0.1f} GiB, verfügbar {a:0.1f} GiB)."
 
-#: lib/create_terraform/handler/vmware.py:748
+#: lib/create_terraform/handler/vmware.py:761
 msgid "Free space in cluster {c!r} in VSphere {v!r} after provisioning: {a:0.1f} GiB."
 msgstr "Freier Speicher in Cluster {c!r} in VSphere {v!r} nach der Provisionierung: {a:0.1f} GiB."
 
-#: lib/create_terraform/handler/vmware.py:760
+#: lib/create_terraform/handler/vmware.py:773
 msgid "Datastore cluster {c!r} of VM {n!r} not found in VSphere {v!r}."
 msgstr "Der Datastore-Cluster {d!r} wurde nicht in VSphere {v!r} gefunden."
 
-#: lib/create_terraform/handler/vmware.py:767
+#: lib/create_terraform/handler/vmware.py:780
 msgid "Validating given datastores of VMs and assign failing ..."
 msgstr "Validiere die übergebenen Datastores der VMs und weise fehlende zu …"
 
-#: lib/create_terraform/handler/vmware.py:773
+#: lib/create_terraform/handler/vmware.py:786
 msgid "Removing defined datastore {d!r} for VM {n!r} ..."
 msgstr "Entferne definierten Datastore {d!r} für VM {n!r} …"
 
-#: lib/create_terraform/handler/vmware.py:798 lib/create_terraform/handler/vmware.py:906
+#: lib/create_terraform/handler/vmware.py:811 lib/create_terraform/handler/vmware.py:919
 msgid "Did not found cluster object {c!r} for VM {n!r}."
 msgstr "Cluster-Objekt {c!r} für VM {n!r} nicht gefunden."
 
-#: lib/create_terraform/handler/vmware.py:808 lib/create_terraform/handler/vmware.py:843
+#: lib/create_terraform/handler/vmware.py:821 lib/create_terraform/handler/vmware.py:856
 msgid "Found datastore {d!r} for VM {n!r} in VSPhere {v!r}."
 msgstr "Fand Datastore {d!r} für VM {n!r} in VSPhere {v!r}."
 
-#: lib/create_terraform/handler/vmware.py:811
+#: lib/create_terraform/handler/vmware.py:824
 msgid "Datastore {d!r} not available in cluster {c!r}."
 msgstr "Der Datastore {d!r} ist im Cluster {c!r} nicht verfügbar."
 
-#: lib/create_terraform/handler/vmware.py:815
+#: lib/create_terraform/handler/vmware.py:828
 msgid "Setting datastore for VM {n!r} to {d!r} ..."
 msgstr "Setze Datastore für VM auf {d!r} …"
 
-#: lib/create_terraform/handler/vmware.py:820
+#: lib/create_terraform/handler/vmware.py:833
 msgid ""
 "Datastore {d!r} has not sufficient space for storage of VM {v!r} (needed {n:0.1f} GiB, available"
 " {a:0.1f} GiB)."
@@ -1372,93 +1378,93 @@ msgstr ""
 "Der Datastore {d!r} hat nicht genügend freien Speicher für die VM {v!r} (benötigt {n:0.1f} GiB, "
 "verfügbar {a:0.1f} GiB)."
 
-#: lib/create_terraform/handler/vmware.py:831
+#: lib/create_terraform/handler/vmware.py:844
 msgid "Datastore {d!r} of VM {n!r} not found in VSPhere {v!r}."
 msgstr "Der Datastore {d!r} für VM {n!r} wurde nicht in VSphere {v!r} gefunden."
 
-#: lib/create_terraform/handler/vmware.py:856
+#: lib/create_terraform/handler/vmware.py:869
 msgid "Validating interfaces of VMs and assign networks ..."
 msgstr "Validiere Netzwerkschnittstellen der VMs und weise Netzwerke zu …"
 
-#: lib/create_terraform/handler/vmware.py:861
+#: lib/create_terraform/handler/vmware.py:874
 msgid "Validated FQDNs:"
 msgstr "Validierte FQDNs:"
 
-#: lib/create_terraform/handler/vmware.py:862
+#: lib/create_terraform/handler/vmware.py:875
 msgid "Validated Addresses:"
 msgstr "Validierte Adressen:"
 
-#: lib/create_terraform/handler/vmware.py:872
+#: lib/create_terraform/handler/vmware.py:885
 msgid "Used networks:"
 msgstr "Verwendete Netzwerke:"
 
-#: lib/create_terraform/handler/vmware.py:878
+#: lib/create_terraform/handler/vmware.py:891
 msgid "Used forward DNS entries:"
 msgstr "Verwendete Vorwärts-DNS-Einträge:"
 
-#: lib/create_terraform/handler/vmware.py:884
+#: lib/create_terraform/handler/vmware.py:897
 msgid "Used reverse DNS entries:"
 msgstr "Verwendete Rückwärts-DNS-Einträge:"
 
-#: lib/create_terraform/handler/vmware.py:890
+#: lib/create_terraform/handler/vmware.py:903
 msgid "Checking interfaces of VM {n!r} in VSPhere {v!r} ..."
 msgstr "Überprüfe Netzwerkschnittstellen der VM {n!r} in VSPhere {v!r} …"
 
-#: lib/create_terraform/handler/vmware.py:894
+#: lib/create_terraform/handler/vmware.py:907
 msgid "No interfaces defined for VM {!r}."
 msgstr "Keine Netzwerkschnittstellen für VM {!r} definiert."
 
-#: lib/create_terraform/handler/vmware.py:923
+#: lib/create_terraform/handler/vmware.py:936
 msgid "Checking interface {i} of VM {n!r} ..."
 msgstr "Überprüfe Netzwerkschnittstelle {i} der VM {n!r} …"
 
-#: lib/create_terraform/handler/vmware.py:927
+#: lib/create_terraform/handler/vmware.py:940
 msgid "Interface {i} of VM {n!r} has no defined address."
 msgstr "Für die Netzwerkschnittstelle {i} der VM {n!r} wurde keine Adresse definiert."
 
-#: lib/create_terraform/handler/vmware.py:933
+#: lib/create_terraform/handler/vmware.py:946
 msgid "Interface {i} of VM {n!r} has no defined FQDN."
 msgstr "Für die Netzwerkschnittstelle {i} der VM {n!r} wurde kein FQDN definiert."
 
-#: lib/create_terraform/handler/vmware.py:939
+#: lib/create_terraform/handler/vmware.py:952
 msgid "FQDN {f!r} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 "Der FQDN {f!r}, der bereits für die VM {va!r}({ia}) definiert wurde, soll für "
 "Netzwerkschnittstelle {ib} von {vb!r} gesetzt werden."
 
-#: lib/create_terraform/handler/vmware.py:951
+#: lib/create_terraform/handler/vmware.py:964
 msgid "IPv4 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 "Die IPv4-Adfresse {a}, die bereits für die VM {va!r}({ia}) definiert wurde, soll für "
 "Netzwerkschnittstelle {ib} von {vb!r} gesetzt werden."
 
-#: lib/create_terraform/handler/vmware.py:966
+#: lib/create_terraform/handler/vmware.py:979
 msgid "IPv6 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr ""
 "Die IPv6-Adfresse {a}, die bereits für die VM {va!r}({ia}) definiert wurde, soll für "
 "Netzwerkschnittstelle {ib} von {vb!r} gesetzt werden."
 
-#: lib/create_terraform/handler/vmware.py:982
+#: lib/create_terraform/handler/vmware.py:995
 msgid "Could not find network {n!r} for VM {v!r}, interface {i}."
 msgstr "Konnte Netzwerk {n!r} für die VM {v!r}, Schnittstelle {i}, nicht finden."
 
-#: lib/create_terraform/handler/vmware.py:994
+#: lib/create_terraform/handler/vmware.py:1007
 msgid "Found network {n!r} for interface {i} of VM {v!r}."
 msgstr "Netzwerk {n!r} für Schnittstelle {i} der VM {v!r} gefunden."
 
-#: lib/create_terraform/handler/vmware.py:998
+#: lib/create_terraform/handler/vmware.py:1011
 msgid "Network {n!r} for interface {i} of VM {v!r} not available in cluster {c!r}."
 msgstr "Das Netzwerk {n!r} für die Schnittstelle {i} der VM {v!r} ist in Cluster {c!r} nicht verfügbar."
 
-#: lib/create_terraform/handler/vmware.py:1003
+#: lib/create_terraform/handler/vmware.py:1016
 msgid "Network {n!r} is available in cluster {c!r}."
 msgstr "Das Netzwerk {n!r} ist in Cluster {c!r} verfügbar."
 
-#: lib/create_terraform/handler/vmware.py:1008
+#: lib/create_terraform/handler/vmware.py:1021
 msgid "Setting gateway of interface {i} of VM {v!r} to {g}."
 msgstr "Setze Gateway von Schnittstelle {i} der VM {v!r} auf {g}."
 
-#: lib/create_terraform/handler/vmware.py:1034
+#: lib/create_terraform/handler/vmware.py:1047
 msgid "Ensuring existence of all necessary vSphere VM folders."
 msgstr "Gewährleiste Existenz aller notwendigen vSphere-VM-Ordner."
 

diff --git a/locale/en_US/LC_MESSAGES/create_terraform.po b/locale/en_US/LC_MESSAGES/create_terraform.po
index d5c03e3030d42ab2700f4c025e70c7c7f2ff35a3..f4c68ea7d3421acb6b41f39ce783b8f32d121858 100644 (file)
--- a/locale/en_US/LC_MESSAGES/create_terraform.po
+++ b/locale/en_US/LC_MESSAGES/create_terraform.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: create_terraform 1.8.10\n"
 "Report-Msgid-Bugs-To: frank.brehm@pixelpark.com\n"
-"POT-Creation-Date: 2024-05-23 16:12+0200\n"
-"PO-Revision-Date: 2024-05-23 15:55+0200\n"
+"POT-Creation-Date: 2024-05-24 10:34+0200\n"
+"PO-Revision-Date: 2024-05-24 10:38+0200\n"
 "Last-Translator: Frank Brehm <frank.brehm@pixelpark.com>\n"
 "Language: en_US\n"
 "Language-Team: Frank Brehm <frank.brehm@pixelpark.com>\n"
@@ -524,7 +524,7 @@ msgstr "And how I said before - it was only a simulation!"
 msgid "Executing {!r} ..."
 msgstr "Executing {!r} …"
 
-#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:491
+#: lib/create_terraform/handler/__init__.py:462 lib/create_terraform/handler/__init__.py:500
 #: lib/create_terraform/handler/first.py:115
 msgid "Completed process:"
 msgstr "Completed process:"
@@ -533,27 +533,27 @@ msgstr "Completed process:"
 msgid "Importing existing virtual machines ..."
 msgstr "Importing existing virtual machines …"
 
-#: lib/create_terraform/handler/__init__.py:472
+#: lib/create_terraform/handler/__init__.py:476
 msgid "Importing VM {!r}."
 msgstr "Importing VM {!r}."
 
-#: lib/create_terraform/handler/__init__.py:489
+#: lib/create_terraform/handler/__init__.py:498
 msgid "Error on importing VM {!r}:"
 msgstr "Error on importing VM {!r}:"
 
-#: lib/create_terraform/handler/__init__.py:511
+#: lib/create_terraform/handler/__init__.py:506
 msgid "Congratulations!"
 msgstr "Congratulations!"
 
-#: lib/create_terraform/handler/__init__.py:513
+#: lib/create_terraform/handler/__init__.py:508
 msgid "Now you are ready to deploy the following virtual machines:"
 msgstr "Now you are ready to deploy the following virtual machines:"
 
-#: lib/create_terraform/handler/__init__.py:517
+#: lib/create_terraform/handler/__init__.py:512
 msgid "To start the deployment process change to directory {}"
 msgstr "To start the deployment process change to directory {}"
 
-#: lib/create_terraform/handler/__init__.py:520
+#: lib/create_terraform/handler/__init__.py:515
 msgid "and enter: {}"
 msgstr "and enter: {}"
 
@@ -1273,51 +1273,59 @@ msgstr "VM info:"
 msgid "Datastore of VM {vm!r}: {ds!r}."
 msgstr "Datastore of VM {vm!r}: {ds!r}."
 
-#: lib/create_terraform/handler/vmware.py:657
+#: lib/create_terraform/handler/vmware.py:643
+msgid ""
+"{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located in folder '{cur_f}' "
+"instead in '{exp_f}'."
+msgstr ""
+"{prefix} - Existing VM '{name}' in vSphere {vs!r} is currently located in folder '{cur_f}' "
+"instead in '{exp_f}'."
+
+#: lib/create_terraform/handler/vmware.py:646 lib/create_terraform/handler/vmware.py:670
 msgid "CAUTION!"
 msgstr "CAUTION!"
 
-#: lib/create_terraform/handler/vmware.py:661
+#: lib/create_terraform/handler/vmware.py:674
 msgid "Did not found any VM to deploy!"
 msgstr "Did not found any VM to deploy!"
 
-#: lib/create_terraform/handler/vmware.py:664
+#: lib/create_terraform/handler/vmware.py:677
 msgid "No VMs to deploy"
 msgstr "No VMs to deploy"
 
-#: lib/create_terraform/handler/vmware.py:680
+#: lib/create_terraform/handler/vmware.py:693
 msgid "Used datastore clusters:"
 msgstr "Used datastore clusters:"
 
-#: lib/create_terraform/handler/vmware.py:682
+#: lib/create_terraform/handler/vmware.py:695
 msgid "No datastore clusters are used."
 msgstr "No datastore clusters are used."
 
-#: lib/create_terraform/handler/vmware.py:689
+#: lib/create_terraform/handler/vmware.py:702
 msgid "Used datastors:"
 msgstr "Used datastors:"
 
-#: lib/create_terraform/handler/vmware.py:691
+#: lib/create_terraform/handler/vmware.py:704
 msgid "No datastores are used."
 msgstr "No datastores are used."
 
-#: lib/create_terraform/handler/vmware.py:696
+#: lib/create_terraform/handler/vmware.py:709
 msgid "Validating given datastore clusters of VMs ..."
 msgstr "Validating given datastore clusters of VMs …"
 
-#: lib/create_terraform/handler/vmware.py:724
+#: lib/create_terraform/handler/vmware.py:737
 msgid "Found datastore cluster {c!r} in VSphere {v!r} for VM {n!r}."
 msgstr "Found datastore cluster {c!r} in VSphere {v!r} for VM {n!r}."
 
-#: lib/create_terraform/handler/vmware.py:728
+#: lib/create_terraform/handler/vmware.py:741
 msgid "Setting datastore cluster for VM {n!r} to {c!r} ..."
 msgstr "Setting datastore cluster for VM {n!r} to {c!r} …"
 
-#: lib/create_terraform/handler/vmware.py:733
+#: lib/create_terraform/handler/vmware.py:746
 msgid "Free space of cluster {c!r} in VSphere {v!r} before provisioning: {a:0.1f} GiB."
 msgstr "Free space of cluster {c!r} in VSphere {v!r} before provisioning: {a:0.1f} GiB."
 
-#: lib/create_terraform/handler/vmware.py:738
+#: lib/create_terraform/handler/vmware.py:751
 msgid ""
 "Datastore cluster {d!r} in VSphere {v!r} has not sufficient space for storage of VM {vm!r} "
 "(needed {n:0.1f} GiB, available {a:0.1f} GiB)."
@@ -1325,39 +1333,39 @@ msgstr ""
 "Datastore cluster {d!r} in VSphere {v!r} has not sufficient space for storage of VM {vm!r} "
 "(needed {n:0.1f} GiB, available {a:0.1f} GiB)."
 
-#: lib/create_terraform/handler/vmware.py:748
+#: lib/create_terraform/handler/vmware.py:761
 msgid "Free space in cluster {c!r} in VSphere {v!r} after provisioning: {a:0.1f} GiB."
 msgstr "Free space in cluster {c!r} in VSphere {v!r} after provisioning: {a:0.1f} GiB."
 
-#: lib/create_terraform/handler/vmware.py:760
+#: lib/create_terraform/handler/vmware.py:773
 msgid "Datastore cluster {c!r} of VM {n!r} not found in VSphere {v!r}."
 msgstr "Datastore cluster {c!r} of VM {n!r} not found in VSphere {v!r}."
 
-#: lib/create_terraform/handler/vmware.py:767
+#: lib/create_terraform/handler/vmware.py:780
 msgid "Validating given datastores of VMs and assign failing ..."
 msgstr "Validating given datastores of VMs and assign failing …"
 
-#: lib/create_terraform/handler/vmware.py:773
+#: lib/create_terraform/handler/vmware.py:786
 msgid "Removing defined datastore {d!r} for VM {n!r} ..."
 msgstr "Removing defined datastore {d!r} for VM {n!r} …"
 
-#: lib/create_terraform/handler/vmware.py:798 lib/create_terraform/handler/vmware.py:906
+#: lib/create_terraform/handler/vmware.py:811 lib/create_terraform/handler/vmware.py:919
 msgid "Did not found cluster object {c!r} for VM {n!r}."
 msgstr "Did not found cluster object {c!r} for VM {n!r}."
 
-#: lib/create_terraform/handler/vmware.py:808 lib/create_terraform/handler/vmware.py:843
+#: lib/create_terraform/handler/vmware.py:821 lib/create_terraform/handler/vmware.py:856
 msgid "Found datastore {d!r} for VM {n!r} in VSPhere {v!r}."
 msgstr "Found datastore {d!r} for VM {n!r} in VSPhere {v!r}."
 
-#: lib/create_terraform/handler/vmware.py:811
+#: lib/create_terraform/handler/vmware.py:824
 msgid "Datastore {d!r} not available in cluster {c!r}."
 msgstr "Datastore {d!r} not available in cluster {c!r}."
 
-#: lib/create_terraform/handler/vmware.py:815
+#: lib/create_terraform/handler/vmware.py:828
 msgid "Setting datastore for VM {n!r} to {d!r} ..."
 msgstr "Setting datastore for VM {n!r} to {d!r} …"
 
-#: lib/create_terraform/handler/vmware.py:820
+#: lib/create_terraform/handler/vmware.py:833
 msgid ""
 "Datastore {d!r} has not sufficient space for storage of VM {v!r} (needed {n:0.1f} GiB, available"
 " {a:0.1f} GiB)."
@@ -1365,87 +1373,87 @@ msgstr ""
 "Datastore {d!r} has not sufficient space for storage of VM {v!r} (needed {n:0.1f} GiB, available"
 " {a:0.1f} GiB)."
 
-#: lib/create_terraform/handler/vmware.py:831
+#: lib/create_terraform/handler/vmware.py:844
 msgid "Datastore {d!r} of VM {n!r} not found in VSPhere {v!r}."
 msgstr "Datastore {d!r} of VM {n!r} not found in VSPhere {v!r}."
 
-#: lib/create_terraform/handler/vmware.py:856
+#: lib/create_terraform/handler/vmware.py:869
 msgid "Validating interfaces of VMs and assign networks ..."
 msgstr "Validating interfaces of VMs and assign networks …"
 
-#: lib/create_terraform/handler/vmware.py:861
+#: lib/create_terraform/handler/vmware.py:874
 msgid "Validated FQDNs:"
 msgstr "Validated FQDNs:"
 
-#: lib/create_terraform/handler/vmware.py:862
+#: lib/create_terraform/handler/vmware.py:875
 msgid "Validated Addresses:"
 msgstr "Validated Addresses:"
 
-#: lib/create_terraform/handler/vmware.py:872
+#: lib/create_terraform/handler/vmware.py:885
 msgid "Used networks:"
 msgstr "Used networks:"
 
-#: lib/create_terraform/handler/vmware.py:878
+#: lib/create_terraform/handler/vmware.py:891
 msgid "Used forward DNS entries:"
 msgstr "Used forward DNS entries:"
 
-#: lib/create_terraform/handler/vmware.py:884
+#: lib/create_terraform/handler/vmware.py:897
 msgid "Used reverse DNS entries:"
 msgstr "Used reverse DNS entries:"
 
-#: lib/create_terraform/handler/vmware.py:890
+#: lib/create_terraform/handler/vmware.py:903
 msgid "Checking interfaces of VM {n!r} in VSPhere {v!r} ..."
 msgstr "Checking interfaces of VM {n!r} in VSPhere {v!r} …"
 
-#: lib/create_terraform/handler/vmware.py:894
+#: lib/create_terraform/handler/vmware.py:907
 msgid "No interfaces defined for VM {!r}."
 msgstr "No interfaces defined for VM {!r}."
 
-#: lib/create_terraform/handler/vmware.py:923
+#: lib/create_terraform/handler/vmware.py:936
 msgid "Checking interface {i} of VM {n!r} ..."
 msgstr "Checking interface {i} of VM {n!r} …"
 
-#: lib/create_terraform/handler/vmware.py:927
+#: lib/create_terraform/handler/vmware.py:940
 msgid "Interface {i} of VM {n!r} has no defined address."
 msgstr "Interface {i} of VM {n!r} has no defined address."
 
-#: lib/create_terraform/handler/vmware.py:933
+#: lib/create_terraform/handler/vmware.py:946
 msgid "Interface {i} of VM {n!r} has no defined FQDN."
 msgstr "Interface {i} of VM {n!r} has no defined FQDN."
 
-#: lib/create_terraform/handler/vmware.py:939
+#: lib/create_terraform/handler/vmware.py:952
 msgid "FQDN {f!r} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr "FQDN {f!r} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 
-#: lib/create_terraform/handler/vmware.py:951
+#: lib/create_terraform/handler/vmware.py:964
 msgid "IPv4 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr "IPv4 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 
-#: lib/create_terraform/handler/vmware.py:966
+#: lib/create_terraform/handler/vmware.py:979
 msgid "IPv6 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 msgstr "IPv6 address {a} already defined for VM {va!r}({ia}) should be set for interface {ib} of {vb!r}."
 
-#: lib/create_terraform/handler/vmware.py:982
+#: lib/create_terraform/handler/vmware.py:995
 msgid "Could not find network {n!r} for VM {v!r}, interface {i}."
 msgstr "Could not find network {n!r} for VM {v!r}, interface {i}."
 
-#: lib/create_terraform/handler/vmware.py:994
+#: lib/create_terraform/handler/vmware.py:1007
 msgid "Found network {n!r} for interface {i} of VM {v!r}."
 msgstr "Found network {n!r} for interface {i} of VM {v!r}."
 
-#: lib/create_terraform/handler/vmware.py:998
+#: lib/create_terraform/handler/vmware.py:1011
 msgid "Network {n!r} for interface {i} of VM {v!r} not available in cluster {c!r}."
 msgstr "Network {n!r} for interface {i} of VM {v!r} not available in cluster {c!r}."
 
-#: lib/create_terraform/handler/vmware.py:1003
+#: lib/create_terraform/handler/vmware.py:1016
 msgid "Network {n!r} is available in cluster {c!r}."
 msgstr "Network {n!r} is available in cluster {c!r}."
 
-#: lib/create_terraform/handler/vmware.py:1008
+#: lib/create_terraform/handler/vmware.py:1021
 msgid "Setting gateway of interface {i} of VM {v!r} to {g}."
 msgstr "Setting gateway of interface {i} of VM {v!r} to {g}."
 
-#: lib/create_terraform/handler/vmware.py:1034
+#: lib/create_terraform/handler/vmware.py:1047
 msgid "Ensuring existence of all necessary vSphere VM folders."
 msgstr "Ensuring existence of all necessary vSphere VM folders."