mirror of
https://github.com/ctripcorp/zeus.git
synced 2024-09-21 16:16:09 +08:00
fix errors after ModelServiceTest
This commit is contained in:
Mengyi Zhou
parent
55f152890a
commit
cbadf442e7
|
|
@ -43,12 +43,13 @@ public class GroupSyncImpl implements GroupSync {
|
|||
@Override
|
||||
public GroupDo add(Group group) throws DalException, ValidationException {
|
||||
validate(group);
|
||||
GroupDo d= C.toGroupDo(group);
|
||||
GroupDo d= C.toGroupDo(0L, group);
|
||||
d.setCreatedTime(new Date());
|
||||
d.setVersion(1);
|
||||
|
||||
groupDao.insert(d);
|
||||
cascadeSync(d, group);
|
||||
group.setId(d.getId());
|
||||
cascadeSync(group);
|
||||
|
||||
return d;
|
||||
}
|
||||
|
|
@ -60,12 +61,12 @@ public class GroupSyncImpl implements GroupSync {
|
|||
if (check.getVersion() > group.getVersion())
|
||||
throw new ValidationException("Newer Group version is detected.");
|
||||
|
||||
GroupDo d= C.toGroupDo(group);
|
||||
GroupDo d= C.toGroupDo(group.getId(), group);
|
||||
groupDao.updateById(d, GroupEntity.UPDATESET_FULL);
|
||||
|
||||
GroupDo updated = groupDao.findByName(group.getName(), GroupEntity.READSET_FULL);
|
||||
d.setVersion(updated.getVersion());
|
||||
cascadeSync(d, group);
|
||||
cascadeSync(group);
|
||||
return d;
|
||||
}
|
||||
|
||||
|
|
@ -96,11 +97,11 @@ public class GroupSyncImpl implements GroupSync {
|
|||
return true;
|
||||
}
|
||||
|
||||
private void cascadeSync(GroupDo d, Group group) throws DalException {
|
||||
private void cascadeSync(Group group) throws DalException {
|
||||
syncGroupSlbs(group.getId(), group.getGroupSlbs());
|
||||
syncGroupHealthCheck(d.getId(), group.getHealthCheck());
|
||||
syncLoadBalancingMethod(d.getId(), group.getLoadBalancingMethod());
|
||||
syncGroupServers(d.getId(), group.getGroupServers());
|
||||
syncGroupHealthCheck(group.getId(), group.getHealthCheck());
|
||||
syncLoadBalancingMethod(group.getId(), group.getLoadBalancingMethod());
|
||||
syncGroupServers(group.getId(), group.getGroupServers());
|
||||
}
|
||||
|
||||
private void syncGroupSlbs(Long groupId, List<GroupSlb> groupSlbs) throws DalException {
|
||||
|
|
@ -119,8 +120,9 @@ public class GroupSyncImpl implements GroupSync {
|
|||
if (old != null) {
|
||||
oldList.remove(old);
|
||||
}
|
||||
e.setGroupId(groupId);
|
||||
e.getVirtualServer().setId(vsId);
|
||||
groupSlbDao.insert(C.toGroupSlbDo(e)
|
||||
.setGroupId(groupId)
|
||||
.setCreatedTime(new Date()));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,9 @@ import org.unidal.dal.jdbc.DalException;
|
|||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @author:xingchaowang
|
||||
|
|
@ -158,9 +160,13 @@ public class SlbQueryImpl implements SlbQuery {
|
|||
private List<Slb> getAllByGroupSlbs(List<GroupSlbDo> list) throws DalException {
|
||||
if (list.size() == 0)
|
||||
return null;
|
||||
Set<Long> visitedIds = new HashSet<>();
|
||||
List<Slb> l = new ArrayList<>();
|
||||
for (GroupSlbDo d : list) {
|
||||
if (visitedIds.contains(d.getSlbId()))
|
||||
continue;
|
||||
Slb slb = getById(d.getSlbId());
|
||||
visitedIds.add(d.getSlbId());
|
||||
if (slb == null)
|
||||
continue;
|
||||
l.add(slb);
|
||||
|
|
|
|||
|
|
@ -41,14 +41,13 @@ public class SlbSyncImpl implements SlbSync {
|
|||
@Override
|
||||
public void add(Slb slb) throws DalException, ValidationException {
|
||||
validate(slb);
|
||||
SlbDo d = C.toSlbDo(slb);
|
||||
SlbDo d = C.toSlbDo(0L, slb);
|
||||
d.setCreatedTime(new Date());
|
||||
d.setVersion(1);
|
||||
|
||||
slbDao.insert(d);
|
||||
cascadeSync(slb);
|
||||
//TODO check
|
||||
slb.setId(d.getId());
|
||||
cascadeSync(slb);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -59,7 +58,7 @@ public class SlbSyncImpl implements SlbSync {
|
|||
throw new ValidationException("Slb does not exist.");
|
||||
if (check.getVersion() > slb.getVersion())
|
||||
throw new ValidationException("Newer Slb version is detected.");
|
||||
SlbDo d = C.toSlbDo(slb);
|
||||
SlbDo d = C.toSlbDo(slb.getId(), slb);
|
||||
slbDao.updateById(d, SlbEntity.UPDATESET_FULL);
|
||||
cascadeSync(slb);
|
||||
}
|
||||
|
|
@ -81,7 +80,7 @@ public class SlbSyncImpl implements SlbSync {
|
|||
}
|
||||
|
||||
private void validate(Slb slb) throws ValidationException {
|
||||
if (slb == null || slb.getId().longValue() < 0) {
|
||||
if (slb == null || slb.getName() == null || slb.getName().isEmpty()) {
|
||||
throw new ValidationException("Slb with null value cannot be persisted.");
|
||||
}
|
||||
if (slb.getSlbServers() == null || slb.getSlbServers().size() == 0) {
|
||||
|
|
@ -173,7 +172,7 @@ public class SlbSyncImpl implements SlbSync {
|
|||
if (old != null) {
|
||||
oldList.remove(old);
|
||||
}
|
||||
SlbVirtualServerDo d = C.toSlbVirtualServerDo(e).setSlbId(slbId).setCreatedTime(new Date());
|
||||
SlbVirtualServerDo d = C.toSlbVirtualServerDo(0L, e).setSlbId(slbId).setCreatedTime(new Date());
|
||||
slbVirtualServerDao.insert(d);
|
||||
|
||||
//Domain
|
||||
|
|
|
|||
|
|
@ -125,9 +125,9 @@ public class C {
|
|||
|
||||
/*Entity to Do*/
|
||||
|
||||
public static GroupDo toGroupDo(Group e) {
|
||||
public static GroupDo toGroupDo(Long groupId, Group e) {
|
||||
return new GroupDo()
|
||||
.setId(e.getId())
|
||||
.setId(groupId)
|
||||
.setAppId(e.getAppId())
|
||||
.setName(e.getName())
|
||||
.setSsl(e.isSsl())
|
||||
|
|
@ -173,9 +173,9 @@ public class C {
|
|||
.setValue(e.getValue());
|
||||
}
|
||||
|
||||
public static SlbDo toSlbDo(Slb e) {
|
||||
public static SlbDo toSlbDo(Long slbId, Slb e) {
|
||||
return new SlbDo()
|
||||
.setId(e.getId())
|
||||
.setId(slbId)
|
||||
.setName(e.getName())
|
||||
.setNginxBin(e.getNginxBin())
|
||||
.setNginxConf(e.getNginxConf())
|
||||
|
|
@ -196,9 +196,9 @@ public class C {
|
|||
.setIp(e.getIp());
|
||||
}
|
||||
|
||||
public static SlbVirtualServerDo toSlbVirtualServerDo(VirtualServer e) {
|
||||
public static SlbVirtualServerDo toSlbVirtualServerDo(Long virtualServerId, VirtualServer e) {
|
||||
return new SlbVirtualServerDo()
|
||||
.setId(e.getId())
|
||||
.setId(virtualServerId)
|
||||
.setPort(e.getPort())
|
||||
.setIsSsl(e.isSsl())
|
||||
.setName(e.getName());
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@
|
|||
<![CDATA[
|
||||
SELECT <FIELDS/>
|
||||
FROM <TABLE/>
|
||||
WHERE <FIELD name='group-id'/> = ${group-id}
|
||||
WHERE <FIELD name='group-id'/> = ${group-id}
|
||||
]]>
|
||||
</statement>
|
||||
</query>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
INSERT INTO <TABLE/>(<FIELDS/>)
|
||||
VALUES(<VALUES/>)
|
||||
ON DUPLICATE KEY UPDATE
|
||||
slb_name = values(slb_name),
|
||||
slb_id = values(slb_id),
|
||||
<FIELD name="data-change-last-time"/> = NOW()
|
||||
]]>
|
||||
</statement>
|
||||
|
|
|
|||
|
|
@ -10,55 +10,10 @@
|
|||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>app</role-hint>
|
||||
<role-hint>archive-group</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>app</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>app-health-check</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>app_health_check</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>app-load-balancing-method</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>app_load_balancing_method</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>app-server</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>app_server</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>app-slb</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>app_slb</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>archive-app</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>archive_app</physical-table-name>
|
||||
<physical-table-name>archive_group</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
|
|
@ -136,19 +91,19 @@
|
|||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>conf-app-active</role-hint>
|
||||
<role-hint>conf-group-active</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>conf_app_active</physical-table-name>
|
||||
<physical-table-name>conf_group_active</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>conf-app-slb-active</role-hint>
|
||||
<role-hint>conf-group-slb-active</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>conf_app_slb_active</physical-table-name>
|
||||
<physical-table-name>conf_group_slb_active</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
|
|
@ -170,6 +125,51 @@
|
|||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>group</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>group</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>group-health-check</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>group_health_check</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>group-load-balancing-method</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>group_load_balancing_method</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>group-server</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>group_server</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>group-slb</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>group_slb</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>nginx-conf</role-hint>
|
||||
|
|
@ -262,10 +262,10 @@
|
|||
</component>
|
||||
<component>
|
||||
<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
|
||||
<role-hint>status-app-server</role-hint>
|
||||
<role-hint>status-group-server</role-hint>
|
||||
<implementation>org.unidal.dal.jdbc.mapping.SimpleTableProvider</implementation>
|
||||
<configuration>
|
||||
<physical-table-name>status_app_server</physical-table-name>
|
||||
<physical-table-name>status_group_server</physical-table-name>
|
||||
<data-source-name>zeus</data-source-name>
|
||||
</configuration>
|
||||
</component>
|
||||
|
|
@ -279,53 +279,8 @@
|
|||
</configuration>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.AppDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.AppDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.AppHealthCheckDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.AppHealthCheckDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.AppLoadBalancingMethodDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.AppLoadBalancingMethodDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.AppServerDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.AppServerDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.AppSlbDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.AppSlbDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.ArchiveAppDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ArchiveAppDao</implementation>
|
||||
<role>com.ctrip.zeus.dal.core.ArchiveGroupDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ArchiveGroupDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
|
|
@ -405,8 +360,8 @@
|
|||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.ConfAppActiveDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ConfAppActiveDao</implementation>
|
||||
<role>com.ctrip.zeus.dal.core.ConfGroupActiveDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ConfGroupActiveDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
|
|
@ -414,8 +369,8 @@
|
|||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.ConfAppSlbActiveDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ConfAppSlbActiveDao</implementation>
|
||||
<role>com.ctrip.zeus.dal.core.ConfGroupSlbActiveDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.ConfGroupSlbActiveDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
|
|
@ -440,6 +395,51 @@
|
|||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.GroupDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.GroupDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.GroupHealthCheckDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.GroupHealthCheckDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.GroupLoadBalancingMethodDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.GroupLoadBalancingMethodDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.GroupServerDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.GroupServerDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.GroupSlbDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.GroupSlbDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
</requirement>
|
||||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.NginxConfDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.NginxConfDao</implementation>
|
||||
|
|
@ -531,8 +531,8 @@
|
|||
</requirements>
|
||||
</component>
|
||||
<component>
|
||||
<role>com.ctrip.zeus.dal.core.StatusAppServerDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.StatusAppServerDao</implementation>
|
||||
<role>com.ctrip.zeus.dal.core.StatusGroupServerDao</role>
|
||||
<implementation>com.ctrip.zeus.dal.core.StatusGroupServerDao</implementation>
|
||||
<requirements>
|
||||
<requirement>
|
||||
<role>org.unidal.dal.jdbc.QueryEngine</role>
|
||||
|
|
|
|||
|
|
@ -8,26 +8,6 @@
|
|||
<constructor-arg type="java.lang.Class" value="org.unidal.dal.jdbc.transaction.TransactionManager"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupHealthCheckDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupHealthCheckDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupLoadBalancingMethodDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupLoadBalancingMethodDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupServerDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupServerDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupSlbDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupSlbDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="archiveGroupDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.ArchiveGroupDao"/>
|
||||
</bean>
|
||||
|
|
@ -80,6 +60,26 @@
|
|||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.DistLockDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupHealthCheckDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupHealthCheckDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupLoadBalancingMethodDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupLoadBalancingMethodDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupServerDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupServerDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="groupSlbDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.GroupSlbDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="nginxConfDao" factory-bean="daoFactory" factory-method="getDao">
|
||||
<constructor-arg type="java.lang.Class" value="com.ctrip.zeus.dal.core.NginxConfDao"/>
|
||||
</bean>
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public class ApiTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testApp() {
|
||||
public void testGroup() {
|
||||
System.out.println("###########################test2");
|
||||
|
||||
SlbClient s = new SlbClient("http://127.0.0.1:8099");
|
||||
|
|
@ -124,25 +124,25 @@ public class ApiTest {
|
|||
GroupClient c = new GroupClient("http://127.0.0.1:8099");
|
||||
c.getAll();
|
||||
|
||||
String appName = "testApp";
|
||||
String appName = "testGroup";
|
||||
|
||||
App app = new App();
|
||||
Group app = new Group();
|
||||
app.setName(appName)
|
||||
.setAppId("999999").setVersion(0)
|
||||
.setHealthCheck(new HealthCheck().setFails(5).setIntervals(50).setPasses(2).setUri("/hotel"))
|
||||
.setLoadBalancingMethod(new LoadBalancingMethod().setType("roundrobin").setValue("test"))
|
||||
.addAppServer(new AppServer().setIp("192.168.20.1").setHostName("slb001a")
|
||||
.addGroupServer(new GroupServer().setIp("192.168.20.1").setHostName("slb001a")
|
||||
.setFailTimeout(30).setMaxFails(2).setPort(80).setWeight(2))
|
||||
.addAppServer(new AppServer().setIp("192.168.20.2").setHostName("slb001a")
|
||||
.addGroupServer(new GroupServer().setIp("192.168.20.2").setHostName("slb001a")
|
||||
.setFailTimeout(30).setMaxFails(2).setPort(80).setWeight(2))
|
||||
.addAppSlb(new AppSlb().setSlbName("default").setVirtualServer(new VirtualServer().setName("vs002").setPort("80")
|
||||
.addGroupSlb(new GroupSlb().setSlbName("default").setVirtualServer(new VirtualServer().setName("vs002").setPort("80")
|
||||
.setSsl(false).addDomain(new Domain().setName("hotel.ctrip.com"))).setPath("/hotel"))
|
||||
;
|
||||
c.add(app);
|
||||
|
||||
App app2 = c.get(appName);
|
||||
Group app2 = c.get(appName);
|
||||
Assert.assertEquals(1, app2.getVersion().intValue());
|
||||
ModelAssert.assertAppEquals(app, app2);
|
||||
ModelAssert.assertGroupEquals(app, app2);
|
||||
}
|
||||
|
||||
private Slb generateSlb(String slbName) {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ public class ModelServiceTest extends AbstractSpringTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testListSlbsByGroupServerAndGroupName() throws Exception {
|
||||
public void testListSlbsByGroupServerAndGroup() throws Exception {
|
||||
List<Slb> slbsByGroupServer = slbRepo.listByGroupServerAndGroup("10.2.6.201", null);
|
||||
Assert.assertEquals(1, slbsByGroupServer.size());
|
||||
List<Slb> slbsByGroupName = slbRepo.listByGroupServerAndGroup(null, testGroup.getId());
|
||||
|
|
@ -214,27 +214,27 @@ public class ModelServiceTest extends AbstractSpringTest {
|
|||
}
|
||||
|
||||
private void addGroups() throws Exception {
|
||||
testGroup = generateGroup("testGroup", defaultSlb.getName(), defaultSlb.getVirtualServers().get(1));
|
||||
testGroup = generateGroup("testGroup", defaultSlb, defaultSlb.getVirtualServers().get(1));
|
||||
insertedTestGroupId = groupRepo.add(testGroup);
|
||||
Assert.assertTrue(insertedTestGroupId > 0);
|
||||
for (int i = 0; i < 6; i++) {
|
||||
Group group = generateGroup("testGroup" + i, defaultSlb.getName(), defaultSlb.getVirtualServers().get(0));
|
||||
Group group = generateGroup("testGroup" + i, defaultSlb, defaultSlb.getVirtualServers().get(0));
|
||||
groupRepo.add(group);
|
||||
}
|
||||
}
|
||||
|
||||
private Group generateGroup(String groupName, String slbName, VirtualServer virtualServer) {
|
||||
private Group generateGroup(String groupName, Slb slb, VirtualServer virtualServer) {
|
||||
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().setSlbName(slbName).setPath("/").setVirtualServer(virtualServer))
|
||||
.addGroupSlb(new GroupSlb().setSlbId(slb.getId()).setSlbName(slb.getName()).setPath("/").setVirtualServer(virtualServer))
|
||||
.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"));
|
||||
}
|
||||
|
||||
private void deleteGroups() throws Exception {
|
||||
Assert.assertEquals(1, groupRepo.delete(testGroup.getId()));
|
||||
for (int i = 0; i < 6; i++) {
|
||||
for (int i = 1; i <= 6; i++) {
|
||||
Assert.assertEquals(1, groupRepo.delete(testGroup.getId() + i));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue