X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvimconn.py;h=7adaa366b8adc2705e692f34093a7021e62ad670;hb=5461675ac6705ee92916ed741da1914bd2162482;hp=b0a40114e3d7dc022259ed4a37f5696ec7347eff;hpb=2935631c49a315fb078d05380569f7e1ca21fcde;p=osm%2FRO.git

diff --git a/osm_ro/vimconn.py b/osm_ro/vimconn.py
index b0a40114..7adaa366 100644
--- a/osm_ro/vimconn.py
+++ b/osm_ro/vimconn.py
@@ -356,7 +356,7 @@ class vimconnector():
         raise vimconnNotImplemented( "Should have implemented this" )
 
     def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None,
-        availavility_zone_index=None, nfv_availability_zones=None):
+        availability_zone_index=None, availability_zone_list=None):
         """Adds a VM instance to VIM
         Params:
             'start': (boolean) indicates if VM must start or created in pause mode.
@@ -387,7 +387,8 @@ class vimconnector():
                 'users': (optional) list of users to be inserted, each item is a dict with:
                     'name': (mandatory) user name,
                     'key-pairs': (optional) list of strings with the public key to be inserted to the user
-                'user-data': (optional) string is a text script to be passed directly to cloud-init
+                'user-data': (optional) can be a string with the text script to be passed directly to cloud-init,
+                    or a list of strings, each one contains a script to be passed, usually with a MIMEmultipart file
                 'config-files': (optional). List of files to be transferred. Each item is a dict with:
                     'dest': (mandatory) string with the destination absolute path
                     'encoding': (optional, by default text). Can be one of:
@@ -399,9 +400,9 @@ class vimconnector():
             'disk_list': (optional) list with additional disks to the VM. Each item is a dict with:
                 'image_id': (optional). VIM id of an existing image. If not provided an empty disk must be mounted
                 'size': (mandatory) string with the size of the disk in GB
-            availavility_zone_index: Index of nfv_availability_zones to use for this this VM
-            nfv_availability_zones: list of availability zones given by user in the VNFC descriptor.  Ignore if
-            availability_zone_index is None
+            availability_zone_index: Index of availability_zone_list to use for this this VM. None if not AV required
+            availability_zone_list: list of availability zones given by user in the VNFD descriptor.  Ignore if
+                availability_zone_index is None
         Returns the instance identifier or raises an exception on error
         """
         raise vimconnNotImplemented( "Should have implemented this" )