i2up-python-sdk 9.1.5.0__tar.gz → 9.1.5.1__tar.gz

{i2up_python_sdk-9.1.5.0/i2up_Python_SDK.egg-info → i2up_python_sdk-9.1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: i2up-python-sdk
-Version: 9.1.5.0
+Version: 9.1.5.1
 Summary: 英方统一数据管理平台python版本SDK
 Author: wanghl
 Author-email: wanghl@info2soft.com

{i2up_python_sdk-9.1.5.0 → i2up_python_sdk-9.1.5.1/i2up_Python_SDK.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: i2up-python-sdk
-Version: 9.1.5.0
+Version: 9.1.5.1
 Summary: 英方统一数据管理平台python版本SDK
 Author: wanghl
 Author-email: wanghl@info2soft.com

{i2up_python_sdk-9.1.5.0 → i2up_python_sdk-9.1.5.1}/info2soft/ContainerCls/v20260209/ContainerCls.py

@@ -14,7 +14,7 @@ class ContainerCls (object):
     '''
     def createContinerClusterBackup(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -27,7 +27,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterBackup(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -42,7 +42,7 @@ class ContainerCls (object):
     def describeContainerClusterBackup(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster_protect/backup/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster_protect/backup/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._get(url, body, self.auth)
         return res
@@ -57,7 +57,7 @@ class ContainerCls (object):
     def modifyContainerClusterBackup(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster_protect/backup/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster_protect/backup/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._put(url, body, self.auth)
         return res
@@ -70,7 +70,7 @@ class ContainerCls (object):
     '''
     def deleteContainerClusterBackup(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup'.format(config.get_default('default_api_host'))
         
         res = https._delete(url, body, self.auth)
         return res
@@ -83,7 +83,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterBackupStatus(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup/status'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup/status'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -96,7 +96,7 @@ class ContainerCls (object):
     '''
     def backupImmediateContainerClusterBackup(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup/operate'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup/operate'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -109,7 +109,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterBackupSubTask(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup/sub_task'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup/sub_task'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -122,7 +122,7 @@ class ContainerCls (object):
     '''
     def getContainerClusterBackupInfo(self, body):
         
-        url = '{0}/v3/container_cluster_protect/backup/info'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/backup/info'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -135,7 +135,7 @@ class ContainerCls (object):
     '''
     def createContainerClusterRecovery(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -147,7 +147,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterRecovery(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
         
         res = https._get(url, None, self.auth)
         return res
@@ -161,7 +161,7 @@ class ContainerCls (object):
     def describeContainerClusterRecovery(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster_protect/recovery/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster_protect/recovery/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._get(url, None, self.auth)
         return res
@@ -176,7 +176,7 @@ class ContainerCls (object):
     def modifyContainerClusterRecovery(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster_protect/recovery/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster_protect/recovery/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._put(url, body, self.auth)
         return res
@@ -189,7 +189,7 @@ class ContainerCls (object):
     '''
     def deleteContainerClusterRecovery(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery'.format(config.get_default('default_api_host'))
         
         res = https._delete(url, body, self.auth)
         return res
@@ -202,7 +202,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterRecoveryStatus(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery/status'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery/status'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -215,7 +215,7 @@ class ContainerCls (object):
     '''
     def listContainerClusterRecoveryPoint(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery/rc_point'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery/rc_point'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -228,7 +228,7 @@ class ContainerCls (object):
     '''
     def startContainerClusterRecovery(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery/operate'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery/operate'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -241,7 +241,7 @@ class ContainerCls (object):
     '''
     def stopContainerClusterRecovery(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery/operate'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery/operate'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -254,7 +254,7 @@ class ContainerCls (object):
     '''
     def getContainerClusterRecoveryInfo(self, body):
         
-        url = '{0}/v3/container_cluster_protect/recovery/info'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster_protect/recovery/info'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res

{i2up_python_sdk-9.1.5.0 → i2up_python_sdk-9.1.5.1}/info2soft/https.py

@@ -311,7 +311,12 @@ def _generate_header(auth_type='', token='', ak='', sk='', method='', url='', _=
         'Signature': ''
     }
     url_parse = urllib.parse.urlsplit(url)
-    sign_str = method.upper() + '\n' + url_parse.path + '\n' + _ + '\n' + str(timestamp) + '\n' + str(nonce)
+    uri = ''
+    api_pos = url_parse.path.find('/api')
+    if api_pos != -1:
+        uri = url_parse.path[api_pos:]
+
+    sign_str = method.upper() + '\n' + uri + '\n' + _ + '\n' + str(timestamp) + '\n' + str(nonce)
     # signature = hmac.new(token, sign_str, digestmod=hashlib.sha256).hexdigest()
     # signature_bytes = ''
 

{i2up_python_sdk-9.1.5.0 → i2up_python_sdk-9.1.5.1}/info2soft/resource/v20260209/ContainerCluster.py

@@ -81,7 +81,7 @@ class ContainerCluster (object):
     '''
     def listBackupDestinationStatus(self, body):
         
-        url = '{0}/v3/backup_destination/status'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/backup_destination/status'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -94,7 +94,7 @@ class ContainerCluster (object):
     '''
     def listContainerClusterInfo(self, body):
         
-        url = '{0}/v3/container_cluster/cls_info'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster/cls_info'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -107,7 +107,7 @@ class ContainerCluster (object):
     '''
     def syncContainerClusterInfo(self, body):
         
-        url = '{0}/v3/container_cluster/sync_info'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster/sync_info'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -146,7 +146,7 @@ class ContainerCluster (object):
     '''
     def containerClusterMonitoringOverview(self, body):
         
-        url = '{0}/v3/container_cluster/monitoring/overview'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster/monitoring/overview'.format(config.get_default('default_api_host'))
         
         res = https._get(url, body, self.auth)
         return res
@@ -158,7 +158,7 @@ class ContainerCluster (object):
     '''
     def containerClusterMonitoringNode(self, body):
         
-        url = '{0}/v3/container_cluster/monitoring/node'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster/monitoring/node'.format(config.get_default('default_api_host'))
         
         res = https._get(url, None, self.auth)
         return res
@@ -171,7 +171,7 @@ class ContainerCluster (object):
     '''
     def createContainerCluster(self, body):
         
-        url = '{0}/v3/container_cluster'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -183,7 +183,7 @@ class ContainerCluster (object):
     '''
     def listContainerCluster(self, body):
         
-        url = '{0}/v3/container_cluster'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster'.format(config.get_default('default_api_host'))
         
         res = https._get(url, None, self.auth)
         return res
@@ -197,7 +197,7 @@ class ContainerCluster (object):
     def describeContainerCluster(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._get(url, None, self.auth)
         return res
@@ -212,7 +212,7 @@ class ContainerCluster (object):
     def modifyContainerCluster(self, body, uuid):
         if uuid is None:
             exit()
-        url = '{0}/v3/container_cluster/{1}'.format(config.get_default('default_api_host'), uuid)
+        url = '{0}/vers/v3/container_cluster/{1}'.format(config.get_default('default_api_host'), uuid)
         
         res = https._put(url, body, self.auth)
         return res
@@ -225,7 +225,7 @@ class ContainerCluster (object):
     '''
     def deleteContainerCluster(self, body):
         
-        url = '{0}/v3/container_cluster'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/container_cluster'.format(config.get_default('default_api_host'))
         
         res = https._delete(url, body, self.auth)
         return res
@@ -305,7 +305,7 @@ class ContainerCluster (object):
     '''
     def cloneCallbackSettings(self, body):
         
-        url = '{0}/v3/callback_settings/operate'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/callback_settings/operate'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res
@@ -318,7 +318,7 @@ class ContainerCluster (object):
     '''
     def verifyCallbackSettingsPod(self, body):
         
-        url = '{0}/v3/callback_settings/pod_verify'.format(config.get_default('default_api_host'))
+        url = '{0}/vers/v3/callback_settings/pod_verify'.format(config.get_default('default_api_host'))
         
         res = https._post(url, body, self.auth)
         return res

{i2up_python_sdk-9.1.5.0 → i2up_python_sdk-9.1.5.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="i2up-python-sdk", # 模块名称
-    version = "9.1.5.0", # 当前版本
+    version = "9.1.5.1", # 当前版本
     author="wanghl", # 作者
     author_email="wanghl@info2soft.com", # 作者邮箱
     description="英方统一数据管理平台python版本SDK", # 简短介绍