X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvimconn_aws.py;fp=osm_ro%2Fvimconn_aws.py;h=3ccef44a5db624292cd7ea0b81179d176036012f;hb=8e3ce87077f8f5a6edc75733ab552780a702fc1d;hp=9b13030a289adbaaf71997c08320d0eee9ded82f;hpb=c4629bd3b12d44dd568240735f8cc546475170a3;p=osm%2FRO.git diff --git a/osm_ro/vimconn_aws.py b/osm_ro/vimconn_aws.py index 9b13030a..3ccef44a 100644 --- a/osm_ro/vimconn_aws.py +++ b/osm_ro/vimconn_aws.py @@ -28,7 +28,7 @@ AWS-connector implements all the methods to interact with AWS using the BOTO cli __author__ = "Saboor Ahmad" __date__ = "10-Apr-2017" -from . import vimconn +import vimconn import yaml import logging import netaddr @@ -275,7 +275,7 @@ class vimconnector(vimconn.vimconnector): pub_subs = pub_split[:3] subnets = pub_subs + pri_subs - return list(map(str, subnets)) + return map(str, subnets) def new_network(self, net_name, net_type, ip_profile=None, shared=False, vlan=None): """Adds a tenant network to VIM @@ -470,7 +470,7 @@ class vimconnector(vimconn.vimconnector): self.logger.debug("Getting flavor id from data") try: flavor = None - for key, values in self.flavor_info.items(): + for key, values in self.flavor_info.iteritems(): if (values["ram"], values["cpus"], values["disk"]) == ( flavor_dict["ram"], flavor_dict["vcpus"], flavor_dict["disk"]): flavor = (key, values)