Merge branch 'platform-dev' of http://47.100.18.120:3000/SEEC/SEEC-II-Demo

src/main/java/nju/seec/SEECdemo/data/entity/ResourceConfig.java

@@ -0,0 +1,33 @@
+package nju.seec.SEECdemo.data.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Todo 是否需要将不同的配置新建为不同的类
+ */
+@Data
+@EqualsAndHashCode
+public class ResourceConfig {
+
+    /*CPU的配置为百分比形式*/
+    private int minCPU;
+
+    private int maxCPU = 10;
+
+    private int defaultCPU;
+
+    private int minMemory;
+
+    private int maxMemory;
+
+    private int defaultMemory;
+
+    /*卷空间*/
+    private int defaultStorage;
+
+    /*最大卷空间*/
+    private int maxStorage;
+
+}
+

src/main/java/nju/seec/SEECdemo/logic/vo/ContainerVO.java

@@ -1,7 +1,6 @@
 package nju.seec.SEECdemo.logic.vo;
 
 import lombok.Data;
-import nju.seec.SEECdemo.data.entity.Port;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,5 +19,5 @@ public class ContainerVO {
 
     private Map<String, String> env = new HashMap<>();
 
-    private Set<Port> ports;
+    private Set<PortVO> ports;
 }

src/main/java/nju/seec/SEECdemo/logic/vo/PortVO.java

@@ -0,0 +1,29 @@
+package nju.seec.SEECdemo.logic.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode
+public class PortVO {
+
+    @NotNull
+//    @Pattern(regexp = NAME_PATTERN)
+    private String name;
+
+    @NotNull
+    @Range(min = 1, max = 65535)
+    private int port;
+
+
+    @NotNull
+    @Pattern(regexp = "^(TCP|UDP)$")
+    private String protocol;
+
+}

src/main/java/nju/seec/SEECdemo/logic/vo/projecttemplate/ProjectTemplate.java

@@ -2,7 +2,7 @@ package nju.seec.SEECdemo.logic.vo.projecttemplate;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import nju.seec.SEECdemo.data.entity.resource.ResourceConfig;
+import nju.seec.SEECdemo.data.entity.ResourceConfig;
 
 @Data
 @EqualsAndHashCode

src/main/java/nju/seec/SEECdemo/util/BeanUtil.java

@@ -1,8 +1,7 @@
 package nju.seec.SEECdemo.util;
 
-import nju.seec.SEECdemo.data.entity.resource.ResourceConfig;
+import nju.seec.SEECdemo.data.entity.ResourceConfig;
 import nju.seec.SEECdemo.logic.vo.projecttemplate.ProjectTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 

src/test/java/nju/seec/SEECdemo/service/ProjectServiceImplTest.java

@@ -0,0 +1,24 @@
+package nju.seec.SEECdemo.service;
+
+import nju.seec.SEECdemo.SeecDemoApplication;
+import nju.seec.SEECdemo.logic.service.ProjectService;
+import nju.seec.SEECdemo.logic.vo.ProjectVO;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ProjectServiceImplTest {
+
+    @Autowired
+    ProjectService projectService;
+
+    @Test
+    public void testCreate(){
+        ProjectVO projectVO = new ProjectVO();
+        projectVO.setName("test-group");
+    }
+}

src/test/java/nju/seec/SEECdemo/service/api/ExecApiImplTest.java

@@ -34,7 +34,7 @@ public class ExecApiImplTest {
                 exec.exec(
                         "group24",
                         "mysql-7b688cf578-l7pxs",
-                        new String[]{"echo hello"},
+                        new String[]{"sh -c echo hello"},
                         false,
                         tty);