allow same service to be hosted in both ways

eclipse-xpanse · Nov 8, 2023 · d0b7b8f · d0b7b8f
1 parent 358cf52
commit d0b7b8f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceCatalogApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceCatalogApi.java
@@ -24,6 +24,7 @@
 import org.eclipse.xpanse.modules.models.service.common.enums.Category;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.servicetemplate.FlavorBasic;
+import org.eclipse.xpanse.modules.models.servicetemplate.enums.ServiceHostingType;
 import org.eclipse.xpanse.modules.models.servicetemplate.query.ServiceTemplateQueryModel;
 import org.eclipse.xpanse.modules.models.servicetemplate.view.UserOrderableServiceVo;
 import org.eclipse.xpanse.modules.servicetemplate.ServiceTemplateManage;
@@ -78,9 +79,12 @@ public List<UserOrderableServiceVo> listOrderableServices(
             @Parameter(name = "serviceName", description = "name of the service")
             @RequestParam(name = "serviceName", required = false) String serviceName,
             @Parameter(name = "serviceVersion", description = "version of the service")
-            @RequestParam(name = "serviceVersion", required = false) String serviceVersion) {
+            @RequestParam(name = "serviceVersion", required = false) String serviceVersion,
+            @Parameter(name = "serviceHostingType", description = "who hosts ths cloud resources")
+            @RequestParam(name = "serviceHostingType", required = false)
+            ServiceHostingType serviceHostingType) {
         ServiceTemplateQueryModel query = getServiceTemplatesQueryModel(
-                categoryName, cspName, serviceName, serviceVersion);
+                categoryName, cspName, serviceName, serviceVersion, serviceHostingType);
         List<ServiceTemplateEntity> serviceEntities =
                 serviceTemplateManage.listServiceTemplates(query);
         String successMsg = String.format("Listing orderable services with query model %s "
@@ -139,9 +143,12 @@ public Link openApi(@PathVariable("id") String id) {
         return Link.of(apiUrl, "OpenApi");
     }
 
-    private ServiceTemplateQueryModel getServiceTemplatesQueryModel(Category category, Csp csp,
-                                                                    String serviceName,
-                                                                    String serviceVersion) {
+    private ServiceTemplateQueryModel getServiceTemplatesQueryModel(
+            Category category,
+            Csp csp,
+            String serviceName,
+            String serviceVersion,
+            ServiceHostingType serviceHostingType) {
         ServiceTemplateQueryModel query = new ServiceTemplateQueryModel();
         if (Objects.nonNull(category)) {
             query.setCategory(category);
@@ -155,6 +162,9 @@ private ServiceTemplateQueryModel getServiceTemplatesQueryModel(Category categor
         if (StringUtils.isNotBlank(serviceVersion)) {
             query.setServiceVersion(serviceVersion);
         }
+        if (Objects.nonNull(serviceHostingType)) {
+            query.setServiceHostingType(serviceHostingType);
+        }
         return query;
     }
 

diff --git a/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceTemplateApi.java b/modules/api/src/main/java/org/eclipse/xpanse/api/controllers/ServiceTemplateApi.java
@@ -27,6 +27,7 @@
 import org.eclipse.xpanse.modules.models.service.common.enums.Category;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
 import org.eclipse.xpanse.modules.models.servicetemplate.Ocl;
+import org.eclipse.xpanse.modules.models.servicetemplate.enums.ServiceHostingType;
 import org.eclipse.xpanse.modules.models.servicetemplate.query.ServiceTemplateQueryModel;
 import org.eclipse.xpanse.modules.models.servicetemplate.view.ServiceTemplateDetailVo;
 import org.eclipse.xpanse.modules.security.IdentityProviderManager;
@@ -213,9 +214,12 @@ public List<ServiceTemplateDetailVo> listServiceTemplates(
             @Parameter(name = "serviceName", description = "name of the service")
             @RequestParam(name = "serviceName", required = false) String serviceName,
             @Parameter(name = "serviceVersion", description = "version of the service")
-            @RequestParam(name = "serviceVersion", required = false) String serviceVersion) {
-        ServiceTemplateQueryModel query =
-                getServiceTemplateQueryModel(categoryName, cspName, serviceName, serviceVersion);
+            @RequestParam(name = "serviceVersion", required = false) String serviceVersion,
+            @Parameter(name = "serviceHostingType", description = "who hosts ths cloud resources")
+            @RequestParam(name = "serviceHostingType", required = false)
+            ServiceHostingType serviceHostingType) {
+        ServiceTemplateQueryModel query = getServiceTemplateQueryModel(
+                categoryName, cspName, serviceName, serviceVersion, serviceHostingType);
         List<ServiceTemplateEntity> serviceEntities =
                 serviceTemplateManage.listServiceTemplates(query);
         String successMsg = String.format("Listing service templates with query model %s "
@@ -254,9 +258,12 @@ public ServiceTemplateDetailVo details(
         return serviceTemplateDetailVo;
     }
 
-    private ServiceTemplateQueryModel getServiceTemplateQueryModel(Category category, Csp csp,
-                                                                   String serviceName,
-                                                                   String serviceVersion) {
+    private ServiceTemplateQueryModel getServiceTemplateQueryModel(
+            Category category,
+            Csp csp,
+            String serviceName,
+            String serviceVersion,
+            ServiceHostingType serviceHostingType) {
         ServiceTemplateQueryModel query = new ServiceTemplateQueryModel();
         if (Objects.nonNull(category)) {
             query.setCategory(category);
@@ -270,6 +277,9 @@ private ServiceTemplateQueryModel getServiceTemplateQueryModel(Category category
         if (StringUtils.isNotBlank(serviceVersion)) {
             query.setServiceVersion(serviceVersion);
         }
+        if (Objects.nonNull(serviceHostingType)) {
+            query.setServiceHostingType(serviceHostingType);
+        }
         CurrentUserInfo currentUserInfo = identityProviderManager.getCurrentUserInfo();
         if (Objects.nonNull(currentUserInfo)
                 && StringUtils.isNotEmpty(currentUserInfo.getNamespace())) {

diff --git a/...a/org/eclipse/xpanse/modules/database/servicetemplate/DatabaseServiceTemplateStorage.java b/...a/org/eclipse/xpanse/modules/database/servicetemplate/DatabaseServiceTemplateStorage.java
@@ -111,6 +111,10 @@ public List<ServiceTemplateEntity> listServiceTemplates(
                         predicateList.add(criteriaBuilder.equal(root.get("namespace"),
                                 serviceQuery.getNamespace()));
                     }
+                    if (Objects.nonNull(serviceQuery.getServiceHostingType())) {
+                        predicateList.add(criteriaBuilder.equal(root.get("serviceHostingType"),
+                                serviceQuery.getServiceHostingType()));
+                    }
 
                     return query.where(criteriaBuilder.and(predicateList.toArray(new Predicate[0])))
                             .getRestriction();

diff --git a/...va/org/eclipse/xpanse/modules/models/servicetemplate/query/ServiceTemplateQueryModel.java b/...va/org/eclipse/xpanse/modules/models/servicetemplate/query/ServiceTemplateQueryModel.java
@@ -9,6 +9,7 @@
 import lombok.Data;
 import org.eclipse.xpanse.modules.models.service.common.enums.Category;
 import org.eclipse.xpanse.modules.models.service.common.enums.Csp;
+import org.eclipse.xpanse.modules.models.servicetemplate.enums.ServiceHostingType;
 
 /**
  * The query model for search register services.
@@ -25,4 +26,6 @@ public class ServiceTemplateQueryModel {
     private String serviceVersion;
 
     private String namespace;
+
+    private ServiceHostingType serviceHostingType;
 }
diff --git a/...rg/eclipse/xpanse/modules/models/servicetemplate/query/ServiceTemplateQueryModelTest.java b/...rg/eclipse/xpanse/modules/models/servicetemplate/query/ServiceTemplateQueryModelTest.java
@@ -47,7 +47,6 @@ void testGetterAndSetter() {
 
     @Test
     void testEqualsAndHashCode() {
-        assertEquals(serviceTemplateQueryModel, serviceTemplateQueryModel);
         assertEquals(serviceTemplateQueryModel.hashCode(), serviceTemplateQueryModel.hashCode());
 
         Object obj = new Object();
@@ -110,10 +109,11 @@ void testEqualsAndHashCode() {
     void testToString() {
         String expectedString = "ServiceTemplateQueryModel(" +
                 "csp=" + csp +
-                ", category=" + category + "" +
-                ", serviceName=" + serviceName + "" +
-                ", serviceVersion=" + serviceVersion + "" +
-                ", namespace=" + namespace + "" +
+                ", category=" + category +
+                ", serviceName=" + serviceName +
+                ", serviceVersion=" + serviceVersion +
+                ", namespace=" + namespace +
+                ", serviceHostingType=" + null +
                 ")";
         assertEquals(expectedString, serviceTemplateQueryModel.toString());
     }

diff --git a/...me/src/test/java/org/eclipse/xpanse/runtime/database/mysql/RegistrationWithMysqlTest.java b/...me/src/test/java/org/eclipse/xpanse/runtime/database/mysql/RegistrationWithMysqlTest.java
@@ -47,7 +47,7 @@ void testRegisterNewService() throws Exception {
                 serviceTemplateApi.register(getOclFromFile());
         Assertions.assertTrue(Objects.nonNull(serviceTemplateDetailVo));
         Assertions.assertEquals(1, serviceTemplateApi.listServiceTemplates(
-                null, null, null, null
+                null, null, null, null, null
         ).stream().filter(registeredServiceVo1 -> registeredServiceVo1.getName()
                 .equals(serviceTemplateDetailVo.getName())).toList().size());
         Assertions.assertEquals("v3.3.2",
@@ -76,7 +76,7 @@ void testServiceRegistrationUpdate() throws Exception {
         ServiceTemplateDetailVo updatedServiceTemplateDetailVo =
                 serviceTemplateApi.update(serviceTemplateDetailVo.getId().toString(), ocl);
         Assertions.assertEquals(1, serviceTemplateApi.listServiceTemplates(
-                null, null, null, null
+                null, null, null, null, null
         ).stream().filter(registeredServiceVo1 -> registeredServiceVo1.getName()
                 .equals(serviceTemplateDetailVo.getName())).toList().size());
         Assertions.assertEquals("Hello",