Merge pull request #163 from baixinsui/feature/refactor_catalog_api

Refactor Deploy API
eclipse-xpanse · Aug 14, 2023 · 18c741b · 18c741b
2 parents fb16779 + 3357fc5
commit 18c741b
Show file tree

Hide file tree

Showing 7 changed files with 387 additions and 621 deletions.
diff --git a/src/xpanse-api/api.json b/src/xpanse-api/api.json
diff --git a/src/xpanse-api/generated/index.ts b/src/xpanse-api/generated/index.ts
@@ -15,7 +15,6 @@ export type { OpenAPIConfig } from './core/OpenAPI';
 export { AbstractCredentialInfo } from './models/AbstractCredentialInfo';
 export { BackendSystemStatus } from './models/BackendSystemStatus';
 export { Billing } from './models/Billing';
-export type { CategoryOclVo } from './models/CategoryOclVo';
 export { CloudServiceProvider } from './models/CloudServiceProvider';
 export { CreateCredential } from './models/CreateCredential';
 export { CreateRequest } from './models/CreateRequest';
@@ -30,7 +29,6 @@ export type { Link } from './models/Link';
 export { Metric } from './models/Metric';
 export { MetricItem } from './models/MetricItem';
 export { Ocl } from './models/Ocl';
-export { ProviderOclVo } from './models/ProviderOclVo';
 export type { Region } from './models/Region';
 export { Response } from './models/Response';
 export { ServiceDetailVo } from './models/ServiceDetailVo';
@@ -39,7 +37,6 @@ export { ServiceVo } from './models/ServiceVo';
 export { SystemStatus } from './models/SystemStatus';
 export type { TokenResponse } from './models/TokenResponse';
 export { UserAvailableServiceVo } from './models/UserAvailableServiceVo';
-export type { VersionOclVo } from './models/VersionOclVo';
 
 export { AdminService } from './services/AdminService';
 export { AuthManagementService } from './services/AuthManagementService';

diff --git a/src/xpanse-api/generated/models/AbstractCredentialInfo.ts b/src/xpanse-api/generated/models/AbstractCredentialInfo.ts
@@ -66,6 +66,7 @@ export namespace AbstractCredentialInfo {
         AWS = 'aws',
         AZURE = 'azure',
         GOOGLE = 'google',
+        SCS = 'scs',
     }
 
     /**

diff --git a/src/xpanse-api/generated/models/CategoryOclVo.ts b/src/xpanse-api/generated/models/CategoryOclVo.ts
diff --git a/src/xpanse-api/generated/models/ProviderOclVo.ts b/src/xpanse-api/generated/models/ProviderOclVo.ts
diff --git a/src/xpanse-api/generated/models/VersionOclVo.ts b/src/xpanse-api/generated/models/VersionOclVo.ts
diff --git a/src/xpanse-api/generated/services/ServiceCatalogService.ts b/src/xpanse-api/generated/services/ServiceCatalogService.ts
@@ -7,7 +7,6 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import type { CategoryOclVo } from '../models/CategoryOclVo';
 import type { Link } from '../models/Link';
 import type { UserAvailableServiceVo } from '../models/UserAvailableServiceVo';
 
@@ -17,7 +16,7 @@ import { request as __request } from '../core/request';
 
 export class ServiceCatalogService {
     /**
-     * Returns the list of all registered services that are available for user to order.<br>Required role:<b> admin</b> or <b>user</b>
+     * List of all registered services which are available for user to order.<br>Required role:<b> admin</b> or <b>user</b>
      * @param categoryName category of the service
      * @param cspName name of the cloud service provider
      * @param serviceName name of the service
@@ -43,7 +42,7 @@ export class ServiceCatalogService {
     ): CancelablePromise<Array<UserAvailableServiceVo>> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/xpanse/services/available',
+            url: '/xpanse/catalog/services',
             query: {
                 categoryName: categoryName,
                 cspName: cspName,
@@ -69,7 +68,7 @@ export class ServiceCatalogService {
     public static availableServiceDetails(id: string): CancelablePromise<UserAvailableServiceVo> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/xpanse/services/available/{id}',
+            url: '/xpanse/catalog/services/{id}',
             path: {
                 id: id,
             },
@@ -92,7 +91,7 @@ export class ServiceCatalogService {
     public static openApi(id: string): CancelablePromise<Link> {
         return __request(OpenAPI, {
             method: 'GET',
-            url: '/xpanse/services/available/{id}/openapi',
+            url: '/xpanse/catalog/services/{id}/openapi',
             path: {
                 id: id,
             },
@@ -105,39 +104,4 @@ export class ServiceCatalogService {
             },
         });
     }
-
-    /**
-     * Get the available services by tree.<br>Required role:<b> admin</b> or <b>isv</b> or <b>user</b>
-     * @param categoryName category of the service
-     * @returns CategoryOclVo OK
-     * @throws ApiError
-     */
-    public static getAvailableServicesTree(
-        categoryName:
-            | 'ai'
-            | 'compute'
-            | 'container'
-            | 'storage'
-            | 'network'
-            | 'database'
-            | 'mediaService'
-            | 'security'
-            | 'middleware'
-            | 'others'
-    ): CancelablePromise<Array<CategoryOclVo>> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/xpanse/services/available/category/{categoryName}',
-            path: {
-                categoryName: categoryName,
-            },
-            errors: {
-                400: `Bad Request`,
-                403: `Forbidden`,
-                422: `Unprocessable Entity`,
-                500: `Internal Server Error`,
-                502: `Bad Gateway`,
-            },
-        });
-    }
 }