move cleanup.py to iaas dir, where it belongs

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

.github/workflows/scs-compliance-check-with-application-credential.yml

@@ -34,7 +34,7 @@ jobs:
           EOF
       - name: "Clean up any lingering resources from previous run"
         if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
-        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
+        run: "cd /scs-compliance && ./iaas/cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"

.github/workflows/scs-compliance-check.yml

@@ -34,7 +34,7 @@ jobs:
           EOF
       - name: "Clean up any lingering resources from previous run"
         if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
-        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
+        run: "cd /scs-compliance && ./iaas/cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"

Tests/cleanup.py Tests/iaas/cleanup.pyTests/cleanup.py renamed to Tests/iaas/cleanup.py

@@ -32,7 +32,7 @@ class Config:
     def __init__(self):
         self.cwd = os.path.abspath(os.path.dirname(sys.argv[0]) or os.getcwd())
         self.scs_compliance_check = os.path.join(self.cwd, 'scs-compliance-check.py')
-        self.cleanup_py = os.path.join(self.cwd, 'cleanup.py')
+        self.cleanup_py = os.path.join(self.cwd, 'iaas', 'cleanup.py')
         self.run_plugin_py = os.path.join(self.cwd, 'kaas', 'plugin', 'run_plugin.py')
         self.ssh_keygen = shutil.which('ssh-keygen')
         self.curl = shutil.which('curl')