apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7722: open vswitch -

Browse Source 
1. add more readable log when tunnel create failed
2. correct drop flow when port number more than 10

other fixs:
return false when vm is null in checkSessionPermision
this avoid null pointer Exception
This commit is contained in:
Frank 2011-01-14 13:44:03 -08:00
parent e736919494
commit 39f75887b1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/vm/hypervisor/xenserver/ovsgre
View File

@ -263,21 +263,23 @@ def ovs_create_gre (session, args):
res = do_cmd(wait)
if bridge not in res:
pr("WARNIING:Can't find bridge %s for creating tunnel!" % bridge)
result = errors["COMMAND_FAILED"]
result = "COMMAND_FAILED_NO_BRIDGE"
return result
createInterface = [vsctlPath, "create interface", "name=%s" % name, \
'type=gre options:"remote_ip=%s key=%s"' % (remoteIP, greKey)]
ifaceUUID = do_cmd (createInterface)
if is_uuid (ifaceUUID) < 0:
result = errors["COMMAND_FAILED"];
pr("create interface failed, %s is not UUID" % ifaceUUID)
result = "COMMAND_FAILED_CREATE_INTERFACE_FAILED"
return result
createPort = [vsctlPath, "create port", "name=%s" % name, \
"interfaces=[%s]" % ifaceUUID]
portUUID = do_cmd (createPort)
if is_uuid (portUUID) < 0:
result = errors["COMMAND_FAILED"];
pr("create port failed, %s is not UUID" % portUUID)
result = "COMMAND_FAILED_CREATE_PORT_FAILED"
return result
addBridge = [vsctlPath, "add bridge %s" % bridge, "ports %s" % portUUID]
@ -293,7 +295,8 @@ def ovs_create_gre (session, args):
do_cmd(noFlood)
result = "SUCCESS:%s" % port
else:
result = errors["COMMAND_FAILED"]
pr("create gre tunnel failed")
result = "COMMAND_FAILED_CREATE_TUNNEL_FAILED"
return result
######################## End GRE creation utils ##########################
@ -421,10 +424,9 @@ def format_drop_flow(inPort):
actions=drop" % inPort
return flow
def add_drop_flow(bridge, inPorts):
for i in inPorts:
flow = format_drop_flow(i)
add_flow(bridge, flow)
def add_drop_flow(bridge, port):
flow = format_drop_flow(port)
add_flow(bridge, flow)
def del_flow(bridge, mac):
param = "dl_dst=%s" % mac

2
server/src/com/cloud/servlet/ConsoleProxyServlet.java
View File

@ -375,7 +375,7 @@ public class ConsoleProxyServlet extends HttpServlet {
if(accountObj.getType() == Account.ACCOUNT_TYPE_ADMIN)
return true;
switch(vm.getType())
{
case User :