Skip to content

Fix xapi pluginlib for XenServer 7 #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ArmedGuy wants to merge 1 commit into from
Closed

Fix xapi pluginlib for XenServer 7 #1739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
import logging
import os
import subprocess
import simplejson as json
try:
import simplejson as json
except ImportError:
import json
import copy

from time import localtime, asctime
Expand Down Expand Up @@ -887,4 +890,4 @@ def is_vpc_network_with_distributed_routing(xs_nw_uuid):
output = proc.stdout.read()
if output.endswith('\n'):
output = output[:-1]
return output
return output