Merge pull request #1591 from deNBI/feat/os_sdk_2

Feat/os sdk 2
deNBI · Dec 19, 2023 · 3c52578 · 3c52578
2 parents 0474acc + 7491c5d
commit 3c52578
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-bookworm
+FROM python:3.11.4-buster
 RUN  apt-get update -y
 RUN apt-get install -y build-essential
 WORKDIR /code

diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py
@@ -2932,11 +2932,11 @@ def get_limits(self):
         maxTotalInstances,totalRamUsed,totalInstancesUsed)
         of the OpenStack Project from the Client.
 
-        :return: {'maxTotalVolumes': maxTotalVolumes, '
-                maxTotalVolumeGigabytes': maxTotalVolumeGigabytes,
-                'maxTotalInstances': maxTotalInstances,
-                 'totalRamUsed': totalRamUsed,
-                'totalInstancesUsed': totalFlInstancesUsed}
+        :return: {'max_total_volumes': max_total_volumes, '
+                max_total_volume_gigabytes': max_total_volume_gigabytes,
+                'max_total_istances': max_total_instances,
+                 'total_ram_used': total_ram_used,
+                'total_instances_used': total_instances_used}
         """
         self.LOG.info("Get Limits")
         limits = {}
@@ -2950,10 +2950,10 @@ def get_limits(self):
             "total_cores_used": str(limits["total_cores_used"]),
             "total_instances_used": str(limits["total_instances_used"]),
             "total_ram_used": str(math.ceil(limits["total_ram_used"] / 1024)),
-            "maxTotalVolumes": str(limits["maxTotalVolumes"]),
-            "maxTotalVolumeGigabytes": str(limits["maxTotalVolumeGigabytes"]),
-            "totalVolumesUsed": str(limits["totalVolumesUsed"]),
-            "totalGigabytesUsed": str(limits["totalGigabytesUsed"]),
+            "max_total_volumes": str(limits["max_total_volumes"]),
+            "max_total_volume_gigabytes": str(limits["max_total_volume_gigabytes"]),
+            "total_volumes_used": str(limits["total_volumes_used"]),
+            "total_gigabytes_used": str(limits["total_gigabytes_used"]),
         }
 
     def install_ansible_galaxy_requirements(self):

diff --git a/VirtualMachineService/VirtualMachineService-remote b/VirtualMachineService/VirtualMachineService-remote
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.17.0)
+# Autogenerated by Thrift Compiler (0.19.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

diff --git a/VirtualMachineService/VirtualMachineService.py b/VirtualMachineService/VirtualMachineService.py
diff --git a/VirtualMachineService/constants.py b/VirtualMachineService/constants.py
diff --git a/VirtualMachineService/ttypes.py b/VirtualMachineService/ttypes.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
 setuptools==68.2.2
 thrift==0.16.0
 python-keystoneclient==5.2.0
-openstacksdk ==1.5.0
+openstacksdk ==2.0.0
 deprecated ==1.2.14
 Click==8.1.7
-ansible==5.1.0
+ansible==5.0.1
 flake8==6.1.0
 paramiko==3.3.1
 ruamel.yaml==0.18.5