From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Tue, 22 Nov 2016 10:35:41 +0000 (+0100)
Subject: Allow compute nodes without hugepages
X-Git-Tag: v1.0.2~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F696%2F1;p=osm%2Fopenvim.git

Allow compute nodes without hugepages

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/httpserver.py b/httpserver.py
index 870d680..9f26737 100644
--- a/httpserver.py
+++ b/httpserver.py
@@ -599,7 +599,6 @@ def http_post_hosts():
                                 sriov['source_name'] = index
                                 index += 1
                             interfaces.append  ({'pci':str(port_k), 'Mbps': port_v['speed']/1000000, 'sriovs': new_sriovs, 'mac':port_v['mac'], 'source_name':port_v['source_name']})
-            #@TODO LA memoria devuelta por el RAD es incorrecta, almenos para IVY1, NFV100
             memory=node['memory']['node_size'] / (1024*1024*1024)
             #memory=get_next_2pow(node['memory']['hugepage_nr'])
             host['numas'].append( {'numa_socket': node['id'], 'hugepages': node['memory']['hugepage_nr'], 'memory':memory, 'interfaces': interfaces, 'cores': cores } )
diff --git a/vim_schema.py b/vim_schema.py
index 1a75dde..0a5929d 100644
--- a/vim_schema.py
+++ b/vim_schema.py
@@ -273,7 +273,7 @@ host_data_schema={
                 "type": "object",
                 "properties":{
                     "admin_state_up":{"type":"boolean"},
-                    "hugepages":integer1_schema,
+                    "hugepages":integer0_schema,
                     "cores":{
                         "type": "array",
                         "minItems":2,
@@ -324,7 +324,7 @@ host_data_schema={
                     "memory":integer1_schema
                 },
                 "additionalProperties": False,
-                "required": ["hugepages","cores","numa_socket"]
+                "required": ["cores","numa_socket"]
             }
         }
     },