From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 7 Feb 2017 12:13:39 +0000 (+0100)
Subject: Merge "Merge branch 'v1.1'"
X-Git-Tag: v2.0.0~45
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=fb1dce6f90f40705665dc615888a67e82aad798b;p=osm%2FRO.git

Merge "Merge branch 'v1.1'"
---

fb1dce6f90f40705665dc615888a67e82aad798b
diff --cc vimconn_openstack.py
index a1146413,80ea09c6..7ba280b0
--- a/vimconn_openstack.py
+++ b/vimconn_openstack.py
@@@ -34,9 -34,9 +34,10 @@@ import loggin
  import netaddr
  import time
  import yaml
+ import random
  
 -from novaclient import client as nClient_v2, exceptions as nvExceptions, api_versions as APIVersion
 +from novaclient import client as nClient_v2, exceptions as nvExceptions
 +from novaclient import api_versions
  import keystoneclient.v2_0.client as ksClient_v2
  from novaclient.v2.client import Client as nClient
  import keystoneclient.v3.client as ksClient