ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Corrected obtaining values from vm_data dict

Browse source
This commit is contained in:
PCoder 2017-09-13 05:37:26 +05:30
commit 612e11736e
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hosting/views.py
View file

@ -984,9 +984,9 @@ class VirtualMachineView(LoginRequiredMixin, View):
# Remove all keys belonging to the IP(s) # Remove all keys belonging to the IP(s)
# ssh-keygen -R ip_address # ssh-keygen -R ip_address
if vm_data.ipv4 is not None: if vm_data['ipv4'] is not None:
if ', ' in vm_data.ipv4: if ', ' in vm_data['ipv4']:
vm_ips = vm_data.ipv4.split(', ') vm_ips = vm_data['ipv4'].split(', ')
for ip_address in vm_ips: for ip_address in vm_ips:
try: try:
subprocess.check_output( subprocess.check_output(
@ -1000,15 +1000,15 @@ class VirtualMachineView(LoginRequiredMixin, View):
else: else:
try: try:
subprocess.check_output( subprocess.check_output(
['ssh-keygen', '-R', vm_data.ipv4]) ['ssh-keygen', '-R', vm_data['ipv4']])
except subprocess.CalledProcessError as cpe: except subprocess.CalledProcessError as cpe:
logger.debug( logger.debug(
"""Could not remove key belonging to {ip}. """Could not remove key belonging to {ip}.
Error details: {details}""".format(ip=vm_data.ipv4, Error details: {details}""".format(ip=vm_data['ipv4'],
details=str(cpe))) details=str(cpe)))
if vm_data.ipv6 is not None: if vm_data['ipv6'] is not None:
if ', ' in vm_data.ipv6: if ', ' in vm_data['ipv6']:
vm_ips = vm_data.ipv6.split(', ') vm_ips = vm_data['ipv6'].split(', ')
for ip_address in vm_ips: for ip_address in vm_ips:
try: try:
subprocess.check_output( subprocess.check_output(
@ -1022,11 +1022,11 @@ class VirtualMachineView(LoginRequiredMixin, View):
else: else:
try: try:
subprocess.check_output( subprocess.check_output(
['ssh-keygen', '-R', vm_data.ipv6]) ['ssh-keygen', '-R', vm_data['ipv6']])
except subprocess.CalledProcessError as cpe: except subprocess.CalledProcessError as cpe:
logger.debug( logger.debug(
"""Could not remove key belonging to {ip}. """Could not remove key belonging to {ip}.
Error details: {details}""".format(ip=vm_data.ipv6, Error details: {details}""".format(ip=vm_data['ipv6'],
details=str(cpe))) details=str(cpe)))
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())