Authored by mlge

伸缩组信息配置----测试环境默认不允许调用伸缩组信息接口

@@ -7,6 +7,7 @@ import com.yoho.ops.cmdb.qcloud.autoscaling.QcloudAutoScalingFetcher; @@ -7,6 +7,7 @@ import com.yoho.ops.cmdb.qcloud.autoscaling.QcloudAutoScalingFetcher;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
  10 +import org.springframework.beans.factory.annotation.Value;
10 import org.springframework.stereotype.Controller; 11 import org.springframework.stereotype.Controller;
11 import org.springframework.web.bind.annotation.RequestMapping; 12 import org.springframework.web.bind.annotation.RequestMapping;
12 import org.springframework.web.bind.annotation.ResponseBody; 13 import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,6 +22,8 @@ import java.util.List; @@ -21,6 +22,8 @@ import java.util.List;
21 @RequestMapping("/autoScaling") 22 @RequestMapping("/autoScaling")
22 public class AutoScalingCtrl { 23 public class AutoScalingCtrl {
23 private final Logger logger = LoggerFactory.getLogger(AutoScalingCtrl.class); 24 private final Logger logger = LoggerFactory.getLogger(AutoScalingCtrl.class);
  25 + @Value("${auto.fetchScaling.open}")
  26 + private boolean autoFetchOpen;
24 @Autowired 27 @Autowired
25 private AutoScalingFetcher awsFetcher; 28 private AutoScalingFetcher awsFetcher;
26 @Autowired 29 @Autowired
@@ -34,7 +37,10 @@ public class AutoScalingCtrl { @@ -34,7 +37,10 @@ public class AutoScalingCtrl {
34 @RequestMapping(value = "/getAutoScaling") 37 @RequestMapping(value = "/getAutoScaling")
35 @ResponseBody 38 @ResponseBody
36 public BaseResponse getAutoScaling(int cloudType){ 39 public BaseResponse getAutoScaling(int cloudType){
37 - BaseResponse response=null; 40 + if(!autoFetchOpen){//伸缩组数据获取开关
  41 + return null;
  42 + }
  43 + BaseResponse response=null;
38 List<AutoScalingGroup> autoScalingGroups=null; 44 List<AutoScalingGroup> autoScalingGroups=null;
39 if(1==cloudType){ 45 if(1==cloudType){
40 autoScalingGroups= awsFetcher.getAutoScaling(); 46 autoScalingGroups= awsFetcher.getAutoScaling();
@@ -47,4 +47,7 @@ spark.read.data.url=http://172.31.50.139:8082/malicious/ @@ -47,4 +47,7 @@ spark.read.data.url=http://172.31.50.139:8082/malicious/
47 check_bigdata=true 47 check_bigdata=true
48 48
49 #自动化测试 49 #自动化测试
50 -auto.task.test.url=http://qmc.yohops.com:9999/autoTask/executeFromGongDan  
  50 +auto.task.test.url=http://qmc.yohops.com:9999/autoTask/executeFromGongDan
  51 +
  52 +#获取伸缩组数据--访问aws、qcloud服务接口
  53 +auto.fetchScaling.open=true
@@ -43,4 +43,7 @@ remove.MaliciousIp=http://uic.yohoops.org/uic/removeMaliciousIp @@ -43,4 +43,7 @@ remove.MaliciousIp=http://uic.yohoops.org/uic/removeMaliciousIp
43 #spark read url 43 #spark read url
44 spark.read.data.url=http://172.31.50.139:8082/malicious/ 44 spark.read.data.url=http://172.31.50.139:8082/malicious/
45 45
46 -check_bigdata=true  
  46 +check_bigdata=true
  47 +
  48 +#获取伸缩组数据--访问aws、qcloud服务接口
  49 +auto.fetchScaling.open=true
@@ -46,4 +46,7 @@ spark.read.data.url=http://172.16.6.140:8088/malicious/ @@ -46,4 +46,7 @@ spark.read.data.url=http://172.16.6.140:8088/malicious/
46 46
47 check_bigdata=false 47 check_bigdata=false
48 48
49 -auto.task.test.url=http://192.168.103.71:8075/autoTask/executeFromGongDan  
  49 +auto.task.test.url=http://192.168.103.71:8075/autoTask/executeFromGongDan
  50 +
  51 +#获取伸缩组数据--访问aws、qcloud服务接口
  52 +auto.fetchScaling.open=false