Skip to content

Commit c252937

Browse files
committed
add junit test case for InstanceServiceImpl(createInstance)
1 parent 215eaa3 commit c252937

7 files changed

Lines changed: 740 additions & 29 deletions

File tree

cloudnative/src/main/java/com/highgo/platform/apiserver/model/vo/request/CreateInstanceVO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.highgo.cloud.enums.InstanceType;
2121
import lombok.Getter;
22+
import lombok.Setter;
2223

2324
import javax.persistence.EnumType;
2425
import javax.persistence.Enumerated;
@@ -31,6 +32,7 @@
3132
import java.util.Map;
3233

3334
@Getter
35+
@Setter
3436
public class CreateInstanceVO implements Serializable {
3537

3638
/**

cloudnative/src/main/java/com/highgo/platform/apiserver/service/impl/InstanceServiceImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ public InstanceVO createInstance(CreateInstanceVO createInstanceVO) {
152152
instanceDTO.getName())) {
153153
throw new InstanceException(InstanceError.DUPLICATE_NAME);
154154
}
155-
// 获取开通实例的集群的配置信息并入库
156-
k8sClusterService.saveClusterInfo(createInstanceVO.getClusterId());
157155

158156
// 执行创建实例并返回实例信息
159157
instanceDTO = createInstance(instanceDTO);

cloudnative/src/main/java/com/highgo/platform/operator/service/impl/CrServiceImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import io.fabric8.kubernetes.client.KubernetesClient;
4848
import io.fabric8.kubernetes.client.Watcher;
4949
import io.fabric8.kubernetes.client.WatcherException;
50+
5051
import org.slf4j.Logger;
5152
import org.slf4j.LoggerFactory;
5253
import org.springframework.beans.factory.annotation.Autowired;
@@ -189,10 +190,13 @@ public boolean isCrExist(String clusterId, String namespace, String crName) {
189190
KubernetesClient k8sClient = k8sClientConfiguration.getAdminKubernetesClientById(clusterId);
190191
DatabaseCluster databaseCluster =
191192
k8sClient.customResources(DatabaseCluster.class).inNamespace(namespace).withName(crName).get();
193+
194+
// DatabaseCluster databaseCluster =
195+
// k8sClient.customResources(DatabaseCluster.class).withName(crName).get();
192196
if (databaseCluster == null) {
193197
return false;
194198
} else {
195-
return false;
199+
return true;
196200
}
197201
}
198202

0 commit comments

Comments
 (0)