Commit f72edd6a authored by wutu's avatar wutu

测试远程vxlan功能模块

parent 61788084
# Default ignored files
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
\ No newline at end of file
...@@ -109,11 +109,11 @@ public class TopologyServiceImpl implements TopologyService { ...@@ -109,11 +109,11 @@ public class TopologyServiceImpl implements TopologyService {
// 两个都是本地交换机 // 两个都是本地交换机
if("".equals(remoteIp1) && "".equals(remoteIp2)) { if("".equals(remoteIp1) && "".equals(remoteIp2)) {
// 创建两个虚拟交换机 // 创建两个虚拟交换机--前边都创建过交换机了,不需要再进行创建
ovsService.addBridge(appName1); //ovsService.addBridge(appName1);
ovsService.addBridge(appName2); //ovsService.addBridge(appName2);
// 创建两个交换机之间的连接 // 创建两个交换机之间的连接
ovsService.linkOvs(appName1, appName2); ovsService.linkOvs(appName1.substring(3), appName2.substring(3));
} }
// 如果两个都是远程交换机 // 如果两个都是远程交换机
...@@ -124,10 +124,10 @@ public class TopologyServiceImpl implements TopologyService { ...@@ -124,10 +124,10 @@ public class TopologyServiceImpl implements TopologyService {
else { else {
if("".equals(remoteIp1)) { if("".equals(remoteIp1)) {
// appName2是远程的 // appName2是远程的
ovsService.setVxlan(appName1, remoteIp2); ovsService.setVxlan(appName1.substring(3), remoteIp2);
} else if("".equals(remoteIp2)) { } else if("".equals(remoteIp2)) {
// appName1是远程的 // appName1是远程的
ovsService.setVxlan(appName2, remoteIp1); ovsService.setVxlan(appName2.substring(3), remoteIp1);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment