ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-22 00:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove enable member from slb server

Browse source
This commit is contained in:
Mengyi Zhou 2015-06-25 13:40:37 +08:00
parent 57bbc3046d
commit 7fba692751
13 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/ctrip/zeus/service/model/handler/impl/GroupSyncImpl.java
View file

@ -84,7 +84,7 @@ public class GroupSyncImpl implements GroupSync {
throw new ValidationException("Group with null value cannot be persisted.");
}
if (!validateVirtualServer(group))
throw new ValidationException("Virtual server id must exist.");
throw new ValidationException("Virtual server cannot be found.");
}
private void removable(Long groupId) throws Exception {

4
src/main/java/com/ctrip/zeus/support/C.java
View file

@ -72,7 +72,6 @@ public class C {
public static SlbServer toSlbServer(SlbServerDo d) {
return new SlbServer()
.setEnable(d.isEnable())
.setHostName(d.getHostName())
.setIp(d.getIp());
}
@ -187,8 +186,7 @@ public class C {
public static SlbServerDo toSlbServerDo(SlbServer e) {
return new SlbServerDo()
.setHostName(e.getHostName())
.setIp(e.getIp())
.setEnable(e.getEnable());
.setIp(e.getIp());
}
public static SlbVipDo toSlbVipDo(Vip e) {

1
src/main/resources/META-INF/dal/model/model-codegen.xml
View file

@ -38,7 +38,6 @@
<attribute name="slb-id" value-type="long" />
<attribute name="ip" value-type="String" />
<attribute name="host-name" value-type="String" />
<attribute name="enable" value-type="boolean" />
</entity>
<entity name="virtual-server">
<attribute name="name" value-type="String" />

6
src/test/java/com/ctrip/zeus/integration/IntegrationTest.java
View file

@ -131,8 +131,8 @@ public class IntegrationTest {
//add slb and vs
Slb slb1 = new Slb().setName(slb1_name).addVip(new Vip().setIp(slb1_server_0)).setNginxBin("/opt/app/nginx/sbin")
.setNginxConf("/opt/app/nginx/conf").setNginxWorkerProcesses(1).setVersion(0)
.addSlbServer(new SlbServer().setHostName("slb1_server_0").setIp(slb1_server_0).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb1_server_1").setIp(slb1_server_1).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb1_server_0").setIp(slb1_server_0))
.addSlbServer(new SlbServer().setHostName("slb1_server_1").setIp(slb1_server_1))
.addVirtualServer(v1)
.addVirtualServer(v2)
.addVirtualServer(v3)
@ -142,7 +142,7 @@ public class IntegrationTest {
Slb slb2 = new Slb().setName(slb2_name).addVip(new Vip().setIp(slb1_server_2)).setNginxBin("/opt/app/nginx/sbin")
.setNginxConf("/opt/app/nginx/conf").setNginxWorkerProcesses(1).setVersion(0)
.addSlbServer(new SlbServer().setHostName("slb1_server_2").setIp(slb1_server_2).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb1_server_2").setIp(slb1_server_2))
.addVirtualServer(v1)
.addVirtualServer(v2)
.addVirtualServer(v3)

4
src/test/java/com/ctrip/zeus/nginx/ConfWriterTest.java
View file

@ -20,8 +20,8 @@ public class ConfWriterTest {
.addDomain(new Domain().setName("hotel.ctrip.com")).setId(2L);
slb.setName(slbName).setNginxBin("/usr/local/nginx/bin").setNginxConf("d:/nginx/conf").setNginxWorkerProcesses(1)
.addVip(new Vip().setIp("192.168.1.3"))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1"))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3"))
.addVirtualServer(vs002)
.addVirtualServer(new VirtualServer().setName("vs003").setPort("80").setSsl(false)
.addDomain(new Domain().setName("m.ctrip.com"))

4
src/test/java/com/ctrip/zeus/nginx/ServerConfTest.java
View file

@ -28,8 +28,8 @@ public class ServerConfTest {
Slb slb = new Slb().setName("default").setNginxBin("/usr/local/nginx/bin").setNginxConf("d:/nginx/conf").setNginxWorkerProcesses(1)
.addVip(new Vip().setIp("192.168.1.3"))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1"))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3"))
.addVirtualServer(vs)
.addVirtualServer(new VirtualServer().setName("vs003").setPort("80").setSsl(false)
.addDomain(new Domain().setName("m.ctrip.com"))

4
src/test/java/com/ctrip/zeus/nginx/UpstreamsConfTest.java
View file

@ -30,8 +30,8 @@ public class UpstreamsConfTest {
Slb slb = new Slb().setName("default").setNginxBin("/usr/local/nginx/bin").setNginxConf("d:/nginx/conf").setNginxWorkerProcesses(1)
.addVip(new Vip().setIp("192.168.1.3"))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("192.168.10.1"))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3"))
.addVirtualServer(vs)
.addVirtualServer(new VirtualServer().setName("vs003").setPort("80").setSsl(false)
.addDomain(new Domain().setName("m.ctrip.com"))

6
src/test/java/com/ctrip/zeus/restful/ApiTest.java
View file

@ -81,7 +81,7 @@ public class ApiTest {
public void run() {
while (true) {
Slb slb = sc.get(slbName);
slb.addSlbServer(new SlbServer().setHostName("slbupd" + num).setIp("192.168.11." + num).setEnable(false));
slb.addSlbServer(new SlbServer().setHostName("slbupd" + num).setIp("192.168.11." + num));
Response updResponse = sc.update(slb);
if (updResponse.getStatus() == 200)
break;
@ -164,8 +164,8 @@ public class ApiTest {
return new Slb().setName(slbName).setNginxBin("/usr/local/nginx/bin").setNginxConf("/usr/local/nginx/conf").setNginxWorkerProcesses(1).setVersion(0)
.addVip(new Vip().setIp("192.168.1.3"))
.addVip(new Vip().setIp("192.168.1.6"))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("1110.1").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3").setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb001a").setIp("1110.1"))
.addSlbServer(new SlbServer().setHostName("slb003").setIp("192.168.10.3"))
.addVirtualServer(new VirtualServer().setName("vs002").setPort("80").setSsl(false)
.addDomain(new Domain().setName("hotel.ctrip.com")))
.addVirtualServer(new VirtualServer().setName("vs003").setPort("80").setSsl(false)

6
src/test/java/com/ctrip/zeus/service/ActivateTest.java
View file

@ -43,8 +43,8 @@ public class ActivateTest extends AbstractAPITest {
Slb slb = new Slb().setName(slb_name).addVip(new Vip().setIp(slb1_server_0)).setNginxBin("/opt/app/nginx/sbin")
.setNginxConf("/opt/app/nginx/conf").setNginxWorkerProcesses(1).setVersion(0)
.addSlbServer(new SlbServer().setHostName("slb1_server_0").setIp(slb1_server_0).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb1_server_1").setIp(slb1_server_1).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slb1_server_0").setIp(slb1_server_0))
.addSlbServer(new SlbServer().setHostName("slb1_server_1").setIp(slb1_server_1))
.addVirtualServer(v1)
.addVirtualServer(v2)
.setStatus("Test");
@ -120,7 +120,7 @@ public class ActivateTest extends AbstractAPITest {
Assert.assertEquals("10.2.25.83",slbentity.getVips().get(0).getIp());
Assert.assertEquals("10.2.25.83",slbentity.getSlbServers().get(0).getIp());
Assert.assertEquals("slb1_server_0",slbentity.getSlbServers().get(0).getHostName());
Assert.assertEquals(true,slbentity.getSlbServers().get(0).getEnable());
Assert.assertEquals(true,slbentity.getSlbServers().get(0));
Assert.assertEquals("__Test_vs1",slbentity.getVirtualServers().get(0).getName());

9
src/test/java/com/ctrip/zeus/service/ModelServiceTest.java
View file

@ -159,9 +159,9 @@ public class ModelServiceTest extends AbstractSpringTest {
.setNginxBin("/opt/group/nginx/sbin").setNginxConf("/opt/group/nginx/conf")
.setNginxWorkerProcesses(2).setStatus("TEST")
.addVip(new Vip().setIp("10.2.25.93"))
.addSlbServer(new SlbServer().setIp("10.2.25.93").setHostName("uat0358").setEnable(true))
.addSlbServer(new SlbServer().setIp("10.2.25.94").setHostName("uat0359").setEnable(true))
.addSlbServer(new SlbServer().setIp("10.2.25.95").setHostName("uat0360").setEnable(true))
.addSlbServer(new SlbServer().setIp("10.2.25.93").setHostName("uat0358"))
.addSlbServer(new SlbServer().setIp("10.2.25.94").setHostName("uat0359"))
.addSlbServer(new SlbServer().setIp("10.2.25.95").setHostName("uat0360"))
.addVirtualServer(new VirtualServer().setName("testsite1").setSsl(false).setPort("80")
.addDomain(new Domain().setName("s1.ctrip.com")))
.addVirtualServer(new VirtualServer().setName("testsite2").setSsl(false).setPort("80")
@ -246,6 +246,7 @@ public class ModelServiceTest extends AbstractSpringTest {
insertedTestGroupId = groupRepo.add(testGroup).getId();
// set virtual server full information
testGroup.getGroupSlbs().get(0).setVirtualServer(defaultSlb.getVirtualServers().get(0));
testGroup.getGroupSlbs().get(0).setSlbName(defaultSlb.getName());
Assert.assertTrue(insertedTestGroupId > 0);
for (int i = 0; i < 6; i++) {
Group group = generateGroup("testGroup" + i, defaultSlb, defaultSlb.getVirtualServers().get(0));
@ -257,7 +258,7 @@ public class ModelServiceTest extends AbstractSpringTest {
return new Group().setName(groupName).setAppId("000000").setVersion(1).setSsl(false)
.setHealthCheck(new HealthCheck().setIntervals(2000).setFails(1).setPasses(1).setUri("/"))
.setLoadBalancingMethod(new LoadBalancingMethod().setType("roundrobin").setValue("test"))
.addGroupSlb(new GroupSlb().setSlbId(slb.getId()).setPath("/").setVirtualServer(new VirtualServer().setId(virtualServer.getId())))
.addGroupSlb(new GroupSlb().setSlbId(slb.getId()).setPath("/" + groupName).setVirtualServer(new VirtualServer().setId(virtualServer.getId())))
.addGroupServer(new GroupServer().setPort(80).setWeight(1).setMaxFails(1).setFailTimeout(30).setHostName("0").setIp("10.2.6.201"))
.addGroupServer(new GroupServer().setPort(80).setWeight(1).setMaxFails(1).setFailTimeout(30).setHostName("0").setIp("10.2.6.202"));
}

6
src/test/java/com/ctrip/zeus/service/StatusTest.java
View file

@ -90,9 +90,9 @@ public class StatusTest extends AbstractAPITest {
return new Slb().setName(slbName).setVersion(7)
.setNginxBin("/opt/group/nginx/sbin").setNginxConf("/opt/group/nginx/conf").setNginxWorkerProcesses(2).setVersion(0)
.addVip(new Vip().setIp("101.2.25.93"))
.addSlbServer(new SlbServer().setHostName("uat0358").setIp("101.2.25.93").setEnable(true))
.addSlbServer(new SlbServer().setHostName("uat0359").setIp("101.2.25.94").setEnable(true))
.addSlbServer(new SlbServer().setHostName("uat0360").setIp("101.2.25.95").setEnable(true))
.addSlbServer(new SlbServer().setHostName("uat0358").setIp("101.2.25.93"))
.addSlbServer(new SlbServer().setHostName("uat0359").setIp("101.2.25.94"))
.addSlbServer(new SlbServer().setHostName("uat0360").setIp("101.2.25.95"))
.addVirtualServer(new VirtualServer().setName("site1").setPort("80").setSsl(false)
.addDomain(new Domain().setName("s1.ctrip.com")))
.addVirtualServer(new VirtualServer().setName("site2").setPort("80").setSsl(false)

2
src/test/java/test/EnvFactory.java
View file

@ -37,7 +37,7 @@ public class EnvFactory {
Slb slb = new Slb().setName(slbName).addVip(new Vip().setIp(vip)).setNginxBin("/opt/app/nginx/sbin")
.setNginxConf("/opt/app/nginx/conf").setNginxWorkerProcesses(1).setVersion(0)
.addSlbServer(new SlbServer().setHostName("slbServer").setIp(vip).setEnable(true))
.addSlbServer(new SlbServer().setHostName("slbServer").setIp(vip))
.setStatus("Test");
for ( VirtualServer vs : vsList )
{

4
src/test/resources/com/ctrip/zeus/model/model.xml
View file

@ -8,8 +8,8 @@
<vip/>
</vips>
<slb-servers>
<slb-server slb-id="123456789012" ip="192.168.1.1" host-name="slb001" enable="true"/>
<slb-server slb-id="123456789012" ip="192.168.1.2" host-name="slb002" enable="true"/>
<slb-server slb-id="123456789012" ip="192.168.1.1" host-name="slb001"/>
<slb-server slb-id="123456789012" ip="192.168.1.2" host-name="slb002"/>
</slb-servers>
<virtual-servers>
<virtual-server name="vs001" id="123456789012" ssl="true">