Skip to content

cli_claim: Support python3.5. (MEGH-1053) #14

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

Open
imliubo wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −15
Open

cli_claim: Support python3.5. (MEGH-1053) #14

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
30 changes: 15 additions & 15 deletions cli/rmaker_tools/rmaker_claim/claim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,27 +240,27 @@ def save_claim_data(dest_filedir, node_id, private_key, node_cert, endpointinfo,
'node.info')
# Create files for each claim data - node info, node key,
# node cert, endpoint info
with open(dest_filedir+'node.info', 'w+') as info_file:
with open(str(dest_filedir+'node.info'), 'w+') as info_file:
info_file.write(node_id)

log.debug("Writing node info at location: " +
dest_filedir + 'node.key')
with open(dest_filedir+'node.key', 'wb+') as info_file:
with open(str(dest_filedir+'node.key'), 'wb+') as info_file:
info_file.write(private_key)

log.debug("Writing node info at location: " +
dest_filedir + 'node.crt')
with open(dest_filedir+'node.crt', 'w+') as info_file:
with open(str(dest_filedir+'node.crt'), 'w+') as info_file:
info_file.write(node_cert)

log.debug("Writing node info at location: " +
dest_filedir + 'endpoint.info')
with open(dest_filedir+'endpoint.info', 'w+') as info_file:
with open(str(dest_filedir+'endpoint.info'), 'w+') as info_file:
info_file.write(endpointinfo)

log.debug("Writing node info at location: " +
dest_filedir + 'node_info.csv')
with open(dest_filedir+'node_info.csv', 'w+') as info_file:
with open(str(dest_filedir+'node_info.csv'), 'w+') as info_file:
for input_line in node_info_csv:
info_file.write(input_line)
info_file.write("\n")
Expand Down Expand Up @@ -457,19 +457,19 @@ def verify_secret_key_exists(secret_key):
return True

def verify_mac_dir_exists(creds_dir, mac_addr):
mac_dir = Path(path.expanduser(str(creds_dir) + '/' + mac_addr))
mac_dir = Path(path.expanduser(str(creds_dir) + '/' + str(mac_addr)))
if mac_dir.exists():
dest_filedir = str(mac_dir) + '/'
output_bin_filename = mac_addr + '.bin'
output_bin_filename = str(mac_addr) + '.bin'
return dest_filedir, output_bin_filename
return False, False

def create_mac_dir(creds_dir, mac_addr):
# Create MAC directory
mac_dir = Path(path.expanduser(str(creds_dir) + '/' + mac_addr))
os.makedirs(path.expanduser(mac_dir))
mac_dir = Path(path.expanduser(str(creds_dir) + '/' + str(mac_addr)))
os.makedirs(path.expanduser(str(mac_dir)))
log.debug("Creating new directory " + str(mac_dir))
output_bin_filename = mac_addr + '.bin'
output_bin_filename = str(mac_addr) + '.bin'
dest_filedir = str(mac_dir) + '/'
return dest_filedir, output_bin_filename

Expand All @@ -483,10 +483,10 @@ def create_config_dir():
str(Path(path.expanduser(
configmanager.CONFIG_DIRECTORY))) +
'/claim_data/' +
userid
str(userid)
))
if not creds_dir.exists():
os.makedirs(path.expanduser(creds_dir))
os.makedirs(path.expanduser(str(creds_dir)))
log.debug("Creating new directory " + str(creds_dir))
return userid, creds_dir

Expand All @@ -503,10 +503,10 @@ def verify_claim_data_binary_exists(userid, mac_addr, dest_filedir, output_bin_f
# Set config mac addr path
mac_addr_config_path = str(Path(path.expanduser(
configmanager.CONFIG_DIRECTORY))) + '/claim_data/' +\
userid +\
str(userid) +\
'/' +\
mac_addr +\
'/' + output_bin_filename
str(mac_addr) +\
'/' + str(output_bin_filename)
# Check if claim data for node exists in CONFIG directory
log.debug("Checking if claim data for node exists in directory: " +
configmanager.HOME_DIRECTORY +
Expand Down