reghao 5 лет назад
Родитель
Сommit
d80a94b4ec

+ 1 - 1
common/src/main/java/cn/reghao/autodop/common/dagent/app/AppOps.java

@@ -5,5 +5,5 @@ package cn.reghao.autodop.common.dagent.app;
  * @date 2020-12-25 19:15:00
  */
 public enum AppOps {
-    appDeploy, appStatus, appLog
+    appDeployOps, appLogOps, appStatusOps, appStartOps, appStopOps, appRestartOps
 }

+ 12 - 3
dmaster/src/test/java/cn/reghao/autodop/common/mq/RabbitProducerTest.java

@@ -1,7 +1,10 @@
 package cn.reghao.autodop.common.mq;
 
+import cn.reghao.autodop.common.dagent.app.AppOps;
+import cn.reghao.autodop.common.dagent.app.DeployArgs;
 import cn.reghao.autodop.common.dagent.machine.MachineShell;
 import cn.reghao.autodop.common.dagent.protocol.RPCResult;
+import cn.reghao.autodop.common.deploy.PackerType;
 import cn.reghao.autodop.common.mq.protocol.MQMessage;
 import cn.reghao.autodop.common.mq.protocol.MessageType;
 import cn.reghao.autodop.common.mq.protocol.machine.MachineMessage;
@@ -44,6 +47,12 @@ class RabbitProducerTest {
 
     @Test
     void callRemote() {
+        DeployArgs deployArgs = new DeployArgs();
+        deployArgs.setPackerType(PackerType.docker.name());
+        deployArgs.setAppId("admin-sys");
+        deployArgs.setAppPath("docker.iquizoo.com/iq3x/admin-sys:2b3dd783ec7e");
+        deployArgs.setRunningDir("");
+
         MachineShell machineShell = new MachineShell();
         machineShell.setType("command");
         machineShell.setContent("cat /etc/nginx/nginx.conf");
@@ -54,9 +63,9 @@ class RabbitProducerTest {
         mqMessage.setMachineId(machineId);
         mqMessage.setSendTime(System.currentTimeMillis());
         mqMessage.setRpc(true);
-        mqMessage.setType(MessageType.machineType.name());
-        mqMessage.setOps(MachineOps.machineShellOps.name());
-        mqMessage.setPayload(JsonConverter.objectToJson(machineShell));
+        mqMessage.setType(MessageType.appType.name());
+        mqMessage.setOps(AppOps.appDeployOps.name());
+        mqMessage.setPayload(JsonConverter.objectToJson(deployArgs));
 
         RPCResult rpcResult = rabbitProducer.callRemote(queueName, mqMessage);
         System.out.println(rpcResult.getResult());