Skip to content
This repository has been archived by the owner on Apr 18, 2019. It is now read-only.

Commit

Permalink
Merge pull request #556 from flyingfish007/master-t3
Browse files Browse the repository at this point in the history
fix an issue that can't update appnode info
  • Loading branch information
flyingfish007 authored Jul 25, 2016
2 parents ec62b60 + f995653 commit acf306b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions source/vsm-dashboard/vsm_dashboard/api/vsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def add_appnodes(request, auth_openstack):
def del_appnode(request, appnode_id):
return vsmclient(request).AppNodeManager.delete(appnode_id)

def update_appnode(request, appnode, **kwargs):
return vsmclient(request).AppNodeManager.update(appnode, **kwargs)
def update_appnode(request, appnode, appnode_info):
return vsmclient(request).AppNodeManager.update(appnode, appnode_info)

def appnode_list(request,):
return vsmclient(request).AppNodeManager.list()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,19 @@ def update_action(request):
os_auth_url = data.pop('os_auth_url')
os_region_name = data.pop('os_region_name')
ssh_user = data.pop('ssh_user')
appnode_info = {
"os_tenant_name": os_tenant_name,
"os_username": os_username,
"os_password": os_password,
"os_auth_url": os_auth_url,
"os_region_name": os_region_name,
"ssh_user": ssh_user,
"ssh_status": "",
"log_info": ""
}
vsmapi.update_appnode(
request, id,
os_tenant_name=os_tenant_name,
os_username=os_username,
os_password=os_password,
os_auth_url=os_auth_url,
os_region_name=os_region_name,
ssh_user=ssh_user,
ssh_status="",
log_info=""
appnode_info
)
status = "OK"
msg = "Update Openstack Access Successfully!"
Expand Down

0 comments on commit acf306b

Please sign in to comment.