X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-aws%2Fosm_rovim_aws%2Fvimconn_aws.py;h=6326cf694f170ea51e4ea1fb8ee27a8f10c3126b;hb=16d3a11b90ae38aeda1e35ef222605d698e292e1;hp=9dec75ab0a36a1193c2381500a99527bd5aa31da;hpb=80135b928ab442c38898750b4751480205b4affc;p=osm%2FRO.git diff --git a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py index 9dec75ab..6326cf69 100644 --- a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py +++ b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py @@ -25,18 +25,18 @@ AWS-connector implements all the methods to interact with AWS using the BOTO client """ -__author__ = "Saboor Ahmad" -__date__ = "10-Apr-2017" - -from osm_ro_plugin import vimconn -import yaml import logging -import netaddr import time import boto import boto.ec2 import boto.vpc +import netaddr +from osm_ro_plugin import vimconn +import yaml + +__author__ = "Saboor Ahmad" +__date__ = "10-Apr-2017" class vimconnector(vimconn.VimConnector): @@ -136,9 +136,9 @@ class vimconnector(vimconn.VimConnector): try: if flavor_data[0] == "@": # read from a file with open(flavor_data[1:], "r") as stream: - self.flavor_info = yaml.load(stream, Loader=yaml.Loader) + self.flavor_info = yaml.safe_load(stream) else: - self.flavor_info = yaml.load(flavor_data, Loader=yaml.Loader) + self.flavor_info = yaml.safe_load(flavor_data) except yaml.YAMLError as e: self.flavor_info = None @@ -767,6 +767,7 @@ class vimconnector(vimconn.VimConnector): start, image_id, flavor_id, + affinity_group_list, net_list, cloud_config=None, disk_list=None,