Fixed some typos

[osm/openvim.git] / osm_openvim / vim_schema.py

diff --git a/osm_openvim/vim_schema.py b/osm_openvim/vim_schema.py
index 697b4e9..f09aff8 100644 (file)
--- a/osm_openvim/vim_schema.py
+++ b/osm_openvim/vim_schema.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ##
-# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
+# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U.
 # This file is part of openvim
 # All Rights Reserved.
 #
@@ -276,6 +276,7 @@ host_data_schema={
         "features": description_schema,
         "ranking": integer0_schema,
         "autodiscover": {"type": "boolean"},    # try to discover host parameters instead of providing in this schema
+        "hypervisors": description_schema,   #Unikernels extension
         "devices": {
             "type": "array", 
             "items": {
@@ -520,6 +521,7 @@ networks_schema={
             "vpci":pci_schema,
             "uuid":id_schema,
             "mac_address": mac_schema,
+            "ip_address": ip_schema,
             "model": {"type":"string", "enum":["virtio","e1000","ne2k_pci","pcnet","rtl8139"]},
             "type": {"type":"string", "enum":["virtual","PF","VF","VFnotShared"]}
         },
@@ -543,6 +545,8 @@ server_new_schema = {
                 "hostId":id_schema,
                 "flavorRef":id_schema,
                 "imageRef":id_schema,
+                "hypervisor":{"type":"string", "enum":["kvm","xen-unik","xenhvm"]}, #Unikernels extension
+                "osImageType":{"type":"string", "enum":["clickos","other"]}, #Unikernels extension
                 "extended": extended_schema,
                 "networks":networks_schema
             },
@@ -774,7 +778,7 @@ of_port_new_schema = {
         "ofc_id": id_schema,
         "region": nameshort_schema,
         "compute_node": nameshort_schema,
-        "pci": pci_extended_schema,
+        "pci": {"OneOf": [{"type": "null"}, pci_extended_schema]},
         "switch_dpid": nameshort_schema,
         "switch_port": nameshort_schema,
         "switch_mac": mac_schema