Switch xapi-storage-scripts tests to python3

With this a "make test" after build out of OPAM on Debian 12 finishes successfully. Signed-off-by: Yann Dirson <[email protected]>
xcp-ng · Jan 19, 2024 · 1ecff5a · 1ecff5a
1 parent 2e963b1
commit 1ecff5a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/plugin.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/sr.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/sr.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import os
 import sys
-import urlparse
+import urllib.parse
 import xapi.storage.api.volume
 
 import plugin
@@ -21,11 +21,11 @@ def create(self, dbg, uri, name, description, configuration):
         return
 
     def detach(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         return
 
     def ls(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return [{
             "name": qr['name'],
@@ -40,7 +40,7 @@ def ls(self, dbg, sr):
             }]
 
     def stat(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
             "sr": sr,

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/volume.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummy/volume.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import uuid
-import urlparse
+import urllib.parse
 import os
 import sys
 import xapi.storage.api.volume
@@ -17,7 +17,7 @@
 class Implementation(xapi.storage.api.volume.Volume_skeleton):
 
     def create(self, dbg, sr, name, description, size):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         voluuid = str(uuid.uuid4())
         return {
             "name": name,
@@ -32,11 +32,11 @@ def create(self, dbg, sr, name, description, size):
         }
 
     def destroy(self, dbg, sr, key):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         return
 
     def stat(self, dbg, sr, key):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
                 "name": qr['name'],

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/plugin.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/plugin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/sr.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/sr.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import os
 import sys
-import urlparse
+import urllib.parse
 import xapi.storage.api.v5.volume
 
 import plugin
@@ -22,11 +22,11 @@ def create(self, dbg, uuid, configuration, name, description):
         return configuration
 
     def detach(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         return
 
     def ls(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return [{
             "name": qr['name'],
@@ -42,7 +42,7 @@ def ls(self, dbg, sr):
             }]
 
     def stat(self, dbg, sr):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
             "sr": sr,

diff --git a/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/volume.py b/ocaml/xapi-storage-script/test/volume/org.xen.xapi.storage.dummyv5/volume.py
@@ -1,11 +1,11 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
  Copyright (C) Citrix Systems, Inc.
 """
 
 import uuid
-import urlparse
+import urllib.parse
 import os
 import sys
 import xapi.storage.api.v5.volume
@@ -17,7 +17,7 @@
 class Implementation(xapi.storage.api.v5.volume.Volume_skeleton):
 
     def create(self, dbg, sr, name, description, size, sharable):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         voluuid = str(uuid.uuid4())
         return {
             "name": name,
@@ -33,11 +33,11 @@ def create(self, dbg, sr, name, description, size, sharable):
         }
 
     def destroy(self, dbg, sr, key):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         return
 
     def stat(self, dbg, sr, key):
-        urlparse.urlparse(sr)
+        urllib.parse.urlparse(sr)
         qr = plugin.Implementation().query(dbg)
         return {
                 "name": qr['name'],