projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Feature 10906: Support for Anti-Affinity groups
[osm/RO.git]
/
RO-VIM-openvim
/
osm_rovim_openvim
/
vimconn_openvim.py
diff --git
a/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
b/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
index
eab0e75
..
e88cecc
100644
(file)
--- a/
RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
+++ b/
RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py
@@
-27,22
+27,23
@@
vimconnector implements all the methods to interact with openvim using the openv
__author__ = "Alfonso Tierno, Gerardo Garcia"
__date__ = "$26-aug-2014 11:09:29$"
__author__ = "Alfonso Tierno, Gerardo Garcia"
__date__ = "$26-aug-2014 11:09:29$"
-from osm_ro_plugin import vimconn
-import requests
import json
import json
-import yaml
import logging
import math
import logging
import math
+from urllib.parse import quote
+
+from jsonschema import exceptions as js_e, validate as js_v
from osm_ro.openmano_schemas import (
from osm_ro.openmano_schemas import (
+ description_schema,
id_schema,
id_schema,
+ integer0_schema,
name_schema,
nameshort_schema,
name_schema,
nameshort_schema,
- description_schema,
vlan1000_schema,
vlan1000_schema,
- integer0_schema,
)
)
-from jsonschema import validate as js_v, exceptions as js_e
-from urllib.parse import quote
+from osm_ro_plugin import vimconn
+import requests
+import yaml
"""contain the openvim virtual machine status to openmano status"""
vmStatus2manoFormat = {
"""contain the openvim virtual machine status to openmano status"""
vmStatus2manoFormat = {
@@
-798,7
+799,7
@@
class vimconnector(vimconn.VimConnector):
self._format_request_exception(e)
def new_image(self, image_dict):
self._format_request_exception(e)
def new_image(self, image_dict):
- """
Adds a tenant image to VIM, returns image_id"""
+ """Adds a tenant image to VIM, returns image_id"""
try:
self._get_my_tenant()
new_image_dict = {"name": image_dict["name"][:64]}
try:
self._get_my_tenant()
new_image_dict = {"name": image_dict["name"][:64]}
@@
-952,6
+953,7
@@
class vimconnector(vimconn.VimConnector):
start,
image_id,
flavor_id,
start,
image_id,
flavor_id,
+ affinity_group_list,
net_list,
cloud_config=None,
disk_list=None,
net_list,
cloud_config=None,
disk_list=None,