From 8e1304aac0c92dbc4d4f122c374a7bc93bcde459 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Fri, 29 Mar 2024 17:46:17 +0800 Subject: [PATCH] [ Cmii ] [ Octopus ] - reformat agent-go - 3 --- agent-operator/image/CmiiImageSync_test.go | 4 -- .../handler/OMessageToServerListener.java | 9 ++- .../server/func/TestImageSyncScheduler.java | 61 ++++++++++++++++++- 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/agent-operator/image/CmiiImageSync_test.go b/agent-operator/image/CmiiImageSync_test.go index 5d8ec70..5d71891 100644 --- a/agent-operator/image/CmiiImageSync_test.go +++ b/agent-operator/image/CmiiImageSync_test.go @@ -28,10 +28,6 @@ func TestGetAllContainer(t *testing.T) { } } -func TestListService(t *testing.T) { - ListService() -} - func TestImageGetAll(t *testing.T) { imageGetAll := GetAll() diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OMessageToServerListener.java b/server/src/main/java/io/wdd/rpc/message/handler/OMessageToServerListener.java index 72489fd..7428519 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/OMessageToServerListener.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/OMessageToServerListener.java @@ -16,7 +16,6 @@ import java.util.ArrayDeque; import java.util.HashMap; import static io.wdd.common.config.OctopusObjectMapperConfig.OctopusObjectMapper; -import static io.wdd.common.config.OctopusObjectMapperConfig.WriteToString; @Configuration @Slf4j(topic = "Octopus Message Listener") @@ -67,10 +66,10 @@ public class OMessageToServerListener { } // Octopus Message Handler - log.info( - "received from agent : {} ", - WriteToString(octopusMessage) - ); +// log.info( +// "received from agent : {} ", +// WriteToString(octopusMessage) +// ); // 获取Agent的版本信息 diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java index d761fe3..74c0b83 100644 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -42,15 +42,70 @@ public class TestImageSyncScheduler { )); ArrayList ImageFullNameList = new ArrayList<>(List.of( - "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032901" + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802" )); Boolean downloadAndCompressOnly = true; String projectNamespace = "wdd"; - String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd -// String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod +// String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd + String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod + + // 之下不要修改 除非你知道自己在干什么! + + // start + ImageSyncContext imageSyncContext = new ImageSyncContext(); + + imageSyncContext.setDownloadAndCompressOnly(downloadAndCompressOnly); + + // inner + imageSyncContext.setInnerWorkerAgentName(innerWorkerAgentName); // dev + + ProjectQueryEntity projectQueryEntity = ProjectQueryEntity.builder().projectNamespace(projectNamespace).build(); + + Page page = coreProjectService.projectQueryByEntity(projectQueryEntity); + if (page.getSize() < 1) { + log.error(" project name space error !"); + return; + } + ProjectInfoPO projectInfoPO = page.getRecords().get(0); + imageSyncContext.setProjectInfoPO(projectInfoPO); + + log.info("project name => {} namespace => {}", projectInfoPO.getProjectName(), projectInfoPO.getProjectNamespace()); + // master + ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectInfoPO.getProjectId()); + Optional master = projectServerVO.getBindingServerList().stream().filter(server -> StringUtils.startsWith(server.getRole(), "master")).findFirst(); + if (master.isEmpty()) { + log.error("project master node not set !"); + return; + } + imageSyncContext.setProjectMasterNode(master.get()); + + log.info("project master node inner ipv4 is => {}", master.get().getServerIpInV4()); + + imageSyncContext.setImageFullNameList(ImageFullNameList); + imageSyncContext.setCmiiAppNameTagList(CmiiAppNameList); + + imageFuncScheduler.runProcedure(imageSyncContext); + } + + @Test + public void downloadAndCompressOnly() { + ArrayList CmiiAppNameList = new ArrayList<>(List.of( +// "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.3.0-cqly-032802" + )); + + ArrayList ImageFullNameList = new ArrayList<>(List.of( + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802" + )); + + Boolean downloadAndCompressOnly = true; + + String projectNamespace = "wdd"; + +// String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd + String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod // 之下不要修改 除非你知道自己在干什么!