Skip to content

<feature>[premium]: remove vpc/slb/policyroute/flowMeter/multicastRouter #4482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatheMatrix wants to merge 1 commit into
base: feature-zsv-5.0.3-mini-iso
Choose a base branch
from
Open

<feature>[premium]: remove vpc/slb/policyroute/flowMeter/multicastRouter #4482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,6 @@
<artifactId>storage-ha-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>routeProtocol</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>flowMeter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>accessKey</artifactId>
Expand All @@ -421,22 +411,7 @@
<artifactId>tag2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>vpc</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.zstack</groupId>
<artifactId>policyRoute</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>vpcFirewall</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.zstack</groupId>
<artifactId>guesttools</artifactId>
Expand Down
219 changes: 0 additions & 219 deletions conf/springConfigXml/vyos.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion conf/zstack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
<import resource="springConfigXml/VolumeManager.xml"/>
<import resource="springConfigXml/volumeSnapshot.xml"/>
<import resource="springConfigXml/ZoneManager.xml"/>
<import resource="springConfigXml/vyos.xml"/>
<import resource="springConfigXml/rest.xml"/>
<import resource="springConfigXml/eventlog.xml"/>
<import resource="springConfigXml/vxlan.xml"/>
Expand Down
18 changes: 0 additions & 18 deletions ...ider/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@
import org.zstack.network.service.virtualrouter.vip.VirtualRouterVipVO;
import org.zstack.network.service.virtualrouter.vip.VirtualRouterVipVO_;
import org.zstack.network.service.virtualrouter.vyos.VyosConstants;
import org.zstack.network.service.virtualrouter.vyos.VyosVersionCheckResult;
import org.zstack.network.service.virtualrouter.vyos.VyosVersionManager;
import org.zstack.tag.SystemTagCreator;
import org.zstack.tag.TagManager;
import org.zstack.utils.*;
Expand Down Expand Up @@ -164,8 +162,6 @@ public class VirtualRouterManagerImpl extends AbstractService implements Virtual
@Autowired
private NetworkServiceManager nwServiceMgr;
@Autowired
private VyosVersionManager vyosVersionManager;
@Autowired
private LbConfigProxy lbProxy;
@Autowired
private VipConfigProxy vipProxy;
Expand Down Expand Up @@ -2238,20 +2234,6 @@ private void handle(CheckVirtualRouterVmVersionMsg cmsg) {
reconenctVirtualRouter(inv.getUuid(), false);
return;
}

vyosVersionManager.vyosRouterVersionCheck(inv.getUuid(), new ReturnValueCompletion<VyosVersionCheckResult>(cmsg) {
@Override
public void success(VyosVersionCheckResult returnValue) {
if (returnValue.isNeedReconnect()) {
logger.warn(String.format("virtual router[uuid: %s] need to be reconnected", inv.getUuid()));
reconenctVirtualRouter(inv.getUuid(), true);
}
}

@Override
public void fail(ErrorCode errorCode) {
}
});
}

@Override
Expand Down
20 changes: 1 addition & 19 deletions ...vider/src/main/java/org/zstack/network/service/virtualrouter/vyos/VyosGetVersionFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
public class VyosGetVersionFlow extends NoRollbackFlow {
private final static CLogger logger = Utils.getLogger(VyosGetVersionFlow.class);
@Autowired
private VyosVersionManager vyosVersionManager;
@Autowired
protected RESTFacade restf;
@Autowired
private VirtualRouterManager vrMgr;
Expand Down Expand Up @@ -62,22 +60,6 @@ public void run(FlowTrigger flowTrigger, Map flowData) {
}

flowData.put(VmInstanceConstant.Params.vmInstanceUuid.toString(), vrUuid);
vyosVersionManager.vyosRouterVersionCheck(vrUuid, new ReturnValueCompletion<VyosVersionCheckResult>(flowTrigger) {
@Override
public void fail(ErrorCode errorCode) {
flowTrigger.next();
}

@Override
public void success(VyosVersionCheckResult returnValue) {
if (returnValue.isNeedReconnect()) {
logger.warn(String.format("virtual router [uuid:%s] need to be reconnect: %s", vrUuid, JSONObjectUtil.toJsonString(returnValue)));
flowData.put(ApplianceVmConstant.Params.isReconnect.toString(), Boolean.TRUE.toString());
flowData.put(ApplianceVmConstant.Params.managementNicIp.toString(), mgmtNic.getIp());
flowData.put(ApplianceVmConstant.Params.rebuildSnat.toString(), returnValue.isRebuildSnat());
}
flowTrigger.next();
}
});
flowTrigger.next();
}
}
Loading