1.修复删除网卡设备bug

2.优化前端结果提示
gitsuke · Apr 11, 2017 · b016df0 · b016df0
1 parent ac306c8
commit b016df0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/VManagePlatform/templates/vmInstance/view_instance.html b/VManagePlatform/templates/vmInstance/view_instance.html
@@ -1408,7 +1408,7 @@ <h4 class="modal-title" id="viewXMLModalLabel">
 
 					},
 			    	error:function(response){
-			    		window.wxc.xcConfirm(response["msg"], window.wxc.xcConfirm.typeEnum.error);
+			    		window.wxc.xcConfirm("操作失败，请先启动虚拟机.", window.wxc.xcConfirm.typeEnum.error);
 			    	}
 				})	
 			}
@@ -1626,7 +1626,7 @@ <h4 class="modal-title" id="viewXMLModalLabel">
 
 						},
 				    	error:function(response){
-				    		window.wxc.xcConfirm(response["msg"], window.wxc.xcConfirm.typeEnum.error);
+				    		window.wxc.xcConfirm("操作失败，请先启动虚拟机.", window.wxc.xcConfirm.typeEnum.error);
 				    	}
 					})	
 				}	   

diff --git a/VManagePlatform/utils/vMConUtils.py b/VManagePlatform/utils/vMConUtils.py
@@ -906,11 +906,11 @@ def addInstanceInterface(self,instance,brName):
 
 
     def delInstanceInterface(self,instance,interName): 
-        '''添加网络设备''' 
+        '''删除网络设备''' 
         interXml = None
         raw_xml = instance.XMLDesc(0)
         domXml = minidom.parseString(raw_xml)
-        for ds in domXml.getElementsByTagName('disk'):
+        for ds in domXml.getElementsByTagName('interface'):
             try:
                 dev = ds.getElementsByTagName('target')[0].getAttribute('dev')
             except:
@@ -924,7 +924,7 @@ def delInstanceInterface(self,instance,interName):
         else:return False  
 
     def delInstanceDisk(self,instance,volPath):
-        '''删除网络设备'''
+        '''删除硬盘'''
         diskXml = None
         raw_xml = instance.XMLDesc(0)
         domXml = minidom.parseString(raw_xml)
@@ -934,7 +934,7 @@ def delInstanceDisk(self,instance,volPath):
             except:
                 continue
             if path == volPath:diskXml = ds.toxml()  
-        if  diskXml:
+        if diskXml:
             try:
                 return instance.detachDeviceFlags(diskXml,3)
             except Exception,e:

diff --git a/VManagePlatform/views/vInstance.py b/VManagePlatform/views/vInstance.py
@@ -187,27 +187,27 @@ def modfInstance(request):
                 if request.POST.get('op') == 'attach': 
                     result = INSTANCE.addInstanceInterface(instance, brName=request.POST.get('netk_name'))
                     recordLogs.delay(user=str(request.user),action='attach_netk',status=result,vm_name=request.POST.get('vm_name'))
-                    if result == 0:return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"})
+                    if isinstance(result,int):return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"})
                     else:return  JsonResponse({"code":500,"data":status,"msg":"添加失败。"})
                 elif  request.POST.get('op') == 'detach':
-                    result = INSTANCE.delInstanceInterface(instance, interName=request.POST.get('netk_name'))
+                    result = INSTANCE.delInstanceInterface(instance, interName=request.POST.get('netk'))
                     recordLogs.delay(user=str(request.user),action='detach_netk',status=result,vm_name=request.POST.get('vm_name'))
-                    if result == 0:return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"})
+                    if isinstance(result,int):return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"})
                     else:return  JsonResponse({"code":500,"data":status,"msg":"添加失败。"})
             #调整内存大小
             elif  request.POST.get('device') == 'mem':
                 if request.POST.get('op') == 'attach': 
                     result = INSTANCE.setMem(instance, mem=int(request.POST.get('mem')))  
                     recordLogs.delay(user=str(request.user),action='attach_mem',status=result,vm_name=request.POST.get('vm_name')) 
-                    if result == 0:return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"}) 
+                    if isinstance(result,int):return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"}) 
                     else:return  JsonResponse({"code":500,"data":None,"msg":"不能设置虚拟机内存超过宿主机机器的物理内存"})
             #调整cpu个数   
             elif  request.POST.get('device') == 'cpu':
                 if request.POST.get('op') == 'attach': 
                     result = INSTANCE.setVcpu(instance, cpu=int(request.POST.get('cpu')))
                     LIBMG.close()
                     recordLogs.delay(user=str(request.user),action='attach_cpu',status=result,vm_name=request.POST.get('vm_name'))
-                    if result == 0:return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"}) 
+                    if isinstance(result,int):return  JsonResponse({"code":200,"data":None,"msg":"操作成功。"}) 
                     else:return  JsonResponse({"code":500,"data":None,"msg":"不能设置虚拟机CPU超过宿主机机器的物理CPU个数"})     
             #调整带宽
             elif  request.POST.get('device') == 'bandwidth':

diff --git a/VManagePlatform/views/vNetwork.py b/VManagePlatform/views/vNetwork.py
@@ -67,7 +67,7 @@ def configNetwork(request):
                     else:
                         VMS.close()
                         return  JsonResponse({"code":500,"msg":"网络创建失败。","data":status.get('stderr')}) 
-                    if result == 0: return  JsonResponse({"code":200,"msg":"网络创建成功。","data":None})   
+                    if isinstance(result,int): return  JsonResponse({"code":200,"msg":"网络创建成功。","data":None})   
                     else:return  JsonResponse({"code":500,"msg":"网络创建失败。","data":None})   
             else:return  JsonResponse({"code":500,"msg":"网络创建失败。","data":None})                                                 
         except Exception,e: