From a514265f39ae14d46fcb22bbc04fa7dccc5d22fc Mon Sep 17 00:00:00 2001
From: fanqq <fanqq@Ctrip.com>
Date: Fri, 26 Jun 2015 15:04:37 +0800
Subject: [PATCH] update

---
 .../zeus/service/build/conf/ServerConf.java   |  6 ++--
 .../service/validate/SlbValidateLocal.java    |  1 +
 .../validate/impl/SlbValidateLocalImpl.java   | 32 +++++++++++++++++--
 .../resources/com/ctrip/zeus/model/model.xml  |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java b/src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java
index 0799089d..55ec11fa 100644
--- a/src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java
+++ b/src/main/java/com/ctrip/zeus/service/build/conf/ServerConf.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class ServerConf {
     private static final Logger LOGGER = LoggerFactory.getLogger(ServerConf.class);
     private static DynamicStringProperty allowSSL = DynamicPropertyFactory.getInstance().getStringProperty("virtual-server-id.ssl", "");
-
+    private static final String SSL_PATH = "/data/nginx/ssl/";
     public static String generate(Slb slb, VirtualServer vs, List<Group> groups) throws Exception{
         StringBuilder b = new StringBuilder(1024);
 
@@ -41,8 +41,8 @@ public class ServerConf {
             {
                 if(String.valueOf(vs.getId()).equals(vsid.trim())){
                     b.append("ssl on;\n")
-                     .append("ssl_certificate /data/nginx/").append(vs.getId()).append("/ssl.crt;\n")
-                     .append("ssl_certificate_key /data/nginx/").append(vs.getId()).append("/ssl.key;\n");
+                     .append("ssl_certificate ").append(SSL_PATH).append(vs.getId()).append("/ssl.crt;\n")
+                     .append("ssl_certificate_key ").append(SSL_PATH).append(vs.getId()).append("/ssl.key;\n");
                 }
             }
         }
diff --git a/src/main/java/com/ctrip/zeus/service/validate/SlbValidateLocal.java b/src/main/java/com/ctrip/zeus/service/validate/SlbValidateLocal.java
index 8b6c841f..d48c1eaa 100644
--- a/src/main/java/com/ctrip/zeus/service/validate/SlbValidateLocal.java
+++ b/src/main/java/com/ctrip/zeus/service/validate/SlbValidateLocal.java
@@ -1,5 +1,6 @@
 package com.ctrip.zeus.service.validate;
 
+import com.ctrip.zeus.model.entity.Slb;
 import com.ctrip.zeus.model.entity.SlbValidateResponse;
 
 /**
diff --git a/src/main/java/com/ctrip/zeus/service/validate/impl/SlbValidateLocalImpl.java b/src/main/java/com/ctrip/zeus/service/validate/impl/SlbValidateLocalImpl.java
index c8aae79b..9b788797 100644
--- a/src/main/java/com/ctrip/zeus/service/validate/impl/SlbValidateLocalImpl.java
+++ b/src/main/java/com/ctrip/zeus/service/validate/impl/SlbValidateLocalImpl.java
@@ -2,7 +2,9 @@ package com.ctrip.zeus.service.validate.impl;
 
 import com.ctrip.zeus.model.entity.Slb;
 import com.ctrip.zeus.model.entity.SlbValidateResponse;
+import com.ctrip.zeus.model.entity.VirtualServer;
 import com.ctrip.zeus.nginx.LocalValidate;
+import com.ctrip.zeus.nginx.entity.NginxResponse;
 import com.ctrip.zeus.service.model.SlbRepository;
 import com.ctrip.zeus.service.validate.SlbValidateLocal;
 
@@ -20,15 +22,39 @@ public class SlbValidateLocalImpl implements SlbValidateLocal {
     @Override
     public SlbValidateResponse validate(Long slbId) throws Exception {
         SlbValidateResponse response = new SlbValidateResponse();
-
+        response.setSlbId(slbId);
         Slb slb = slbRepository.getById(slbId);
         if (slb == null)
         {
-            response.setSlbId(slbId).setSucceed(false).setMsg("Not found Slb by slbId!");
+            response.setSucceed(false).setMsg("Not found Slb by slbId!");
             return response;
         }
-        
+        if (!validateNginxBinAndConf(slb)){
+            response.setSucceed(false).setMsg("slb conf path or bin path is not exist!");
+            return response;
+        }
+        NginxResponse res = localValidate.nginxIsUp(slb.getNginxBin());
+        if (!res.getSucceed()){
+            response.setSucceed(false).setMsg(res.getOutMsg());
+            return response;
+        }
+        for (VirtualServer vs : slb.getVirtualServers())
+        {
+            if (vs.getSsl())
+            {
+
+            }
+        }
+
 
         return null;
     }
+
+    private boolean validateNginxBinAndConf(Slb slb) throws Exception {
+        return localValidate.pathExistValidate(slb.getNginxBin(),true)&&
+                localValidate.pathExistValidate(slb.getNginxConf(),true);
+    }
+    private boolean validateNginxIsUp(Slb slb)throws Exception{
+
+    }
 }
diff --git a/src/test/resources/com/ctrip/zeus/model/model.xml b/src/test/resources/com/ctrip/zeus/model/model.xml
index 7984a640..30635760 100644
--- a/src/test/resources/com/ctrip/zeus/model/model.xml
+++ b/src/test/resources/com/ctrip/zeus/model/model.xml
@@ -199,6 +199,7 @@
         <succeed>true</succeed>
         <msg>msg</msg>
         <slb-id>12345678901</slb-id>
+        <ip>127.0.0.1</ip>
     </slb-validate-response>