From 96967ed6f491310302a1d39e40e8697255e0441f Mon Sep 17 00:00:00 2001
From: Luis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch>
Date: Fri, 23 Nov 2012 09:46:52 +0100
Subject: [PATCH] Added cpu_info report to HyperV Compute driver

It fixes bug 1082275

The current version of the HyperV Compute driver wasn't returning
CPU information when it reported its resources.

In order to solve it, this patch extracts the cpu properties
from WMI and Win32 calls.

Change-Id: I5c2a89b5e432f4e958354a15582258d4cff83658
---
 ...ase.test_get_available_resource_ctypes.p.gz | Bin 0 -> 926 bytes
 ...get_available_resource_multiprocessing.p.gz | Bin 270 -> 270 bytes
 ...estCase.test_get_available_resource_os.p.gz | Bin 423 -> 423 bytes
 ...ase.test_get_available_resource_shutil.p.gz | Bin 309 -> 309 bytes
 ...stCase.test_get_available_resource_wmi.p.gz | Bin 980 -> 1276 bytes
 nova/tests/test_hypervapi.py                   |   5 +++--
 6 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz

diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_ctypes.p.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b363af55abaec4a0bb5ffbe73b5a2097f7f010ac
GIT binary patch
literal 926
zcmV;P17Z9hiwFo_{jE>}|8!+@bYEzBaAk6KVQ^_KNO^E&a#lf5NmONXbVFftWiE7O
zb97&4WprO*c4293VPb4$Uvg!0Z*_8GWnW`-d2nTOE^q*?luc{fKomvy^D9a>PM`$c
zH<Ctz(q$owme6hk!cm2r*0qErrwyh5z4Q4V8A`p8iDh~8-sSoPPT!Byb2kqMWiS1B
zTGsj8uj8zyLS6Nz@o9gv4$HdSe0`pV`RV4z*ngkq@z=BZVDHof)py;)`SG|up1Mwr
z58sA<RTHU?>!j7EsZ>{Arb>O@b^E>_mZj^*^J(3wsdf*HTI`dj{qa03_N;MdtsVaP
zc=~cY+7s9o#|cmedvmZKJ{V+^q1`k}b?{NB)N=3vsBOacVLlB<O)kUuj3&!yZ3Y!?
zfe<r@QU+<8al72jqbohm?}z<*o`<`6SO#C8N*7Ai%TTIasPPF+3T;!UE*yuh-ye@%
zXEQYXDcRGjd;529FR$OO7WAw8@Y+3|)^z*s^_y$=`Nlom{r=;w*Z!;fvb%PH+Lh9!
zx`o;=%kr>K?-wm~Wm{@rPMg?LH{7yShk&dsUjDig?jK5SsMK+<EYn_TSp+I&o$VR7
z7lzunR~2cmvSWcnwH=Adlc+9{s2qtZ6iOs2CQ&hoIwMg#6168$ClWQ2sF_5ak*FPs
zIt(QehDjJEVYVY-JPC7&gmENHD3nMTCSjOFlaXi~iN=#?5{ZUMG)$t&NHmT_6NVCr
zmPxcsqTP-}>q)eiNVJYb8ww>7Et6=O1d0p=3daJ4hk+u|K*2arFb@=UzHR(=9863A
zh5|4ZU^^^;4vxJ925@A6*voLkMj8qo%IT1&LxB!49TGYubSS4oo({!9rlW<97CIX$
z6~U>vC{=i?LdRZAN5l#-D{{5MyA?sMV7o%}3h^s)!NMCBWgKKWB3X!Kv7u%WJd2B>
zg*Pp#*o*0iY$3Kqu3LEDA_y03T!?ZZ&P6U=c<Z8$gG@)n3o$P?R4;;iaZ$eT_JxVP
zn2rb-VqoM7hIcT6guxbuXc*#Q<RXSQF`78YbVSAw8)HKqBls9j$i;u@cq5~Yy_k+j
z8DeG1txVp^6s$~aWfCisSebGwleaPzaWK&#u`-F3X+tYhurlEi9r9Kt#9oFQHqub&
z<W?qcWeQd%wlay8Nvuq{mC0L~C=N0mu`-F3X+tYhurmG2%JzNp7v@~EuGS0y0Q_;V
AFaQ7m

literal 0
HcmV?d00001

diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_multiprocessing.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_multiprocessing.p.gz
index dd8eb124817dbaaa40e3b3aafe35ff9a43a6881e..92dfc08238f60eec6bd1cd1283ddb04fc2e5ea12 100644
GIT binary patch
delta 16
XcmeBU>SJP;@8;l$`@41{J3Au)CsYKg

delta 16
XcmeBU>SJP;@8;l8WL~<Fot+T?AEg6p

diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_os.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_os.p.gz
index 27611287ce5d7f0eb1da43844f2b67406198a207..e2ccdc024d65b16982d213ee424d5d09e3438c5f 100644
GIT binary patch
delta 16
XcmZ3^yquX`zMF$1?(f=-><btHE06_u

delta 16
XcmZ3^yquX`zMF$Xk$LGx_63XpBjE%%

diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_shutil.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_shutil.p.gz
index 47e882ab01abd7b7eff54861511b515b16f98158..8a4186b2f8ea49d4681612ed61c18d53bd7c0e96 100644
GIT binary patch
delta 16
XcmdnWw3UfnzMF$1?(f=-?0Sp<EHnil

delta 16
XcmdnWw3UfnzMF$Xk$LGxc0EP_B!vUu

diff --git a/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_wmi.p.gz b/nova/tests/hyperv/stubs/test_hypervapi.HyperVAPITestCase.test_get_available_resource_wmi.p.gz
index 3b91f7e0a9429e81822e200871b0da42612e49bb..3747f8f033364cf4de40964cfd2b98646173d09a 100644
GIT binary patch
delta 1223
zcmV;&1UUQD2mA>KABzYGUj40+2S<NaT~FgU6n*!vi24HT(&B5!`9PY75ir_HQy5WH
z_5mph!GtVnl1b9ec1QEy_g*_mY3Y7xD=@L^9G`pc^|>TTS#6?PrwoUrESk1nC2d)=
zinHUSDA)0%)lJ(>UN)7k*OO(LyjFGj`-aW%iB-UoD0*CFd7Bkc#LCCtbkcvaO0es;
zlI*r}+3{1Q*!(DplSDU7l$5KYJz|wdU-+!SZ`N_X(haT!v=-v#``Hwyz-bPE3&#)m
z^MJz%ji=7&JN;djMfR#|dOUY%JUg45)n(b9eOqQU|1mnD-493Ke>@zW5Tszoc?FWC
zh@ApU4N-8BDJXNA$5KNLkXwIh2tj}ZzOHn=A%KvU1b@qEG{5?Mb#dqX<b1llnK`q0
zHourpr$yFgF-jTDG48A^F7mi(oI{`cU#@PioV&PAb$cBz^@j)hIm*5k6TyLxfltah
zos^Zv48_Uo`MS(kOFe#)&ta%QjN@koV>kBIIMy1*ei-;lbMQcgJ=lNfv=fg;6a>dT
zbp(()LhPy|D38J<Qm9TH;q~eWpOPD8t*)bpFam=S(kMB@kRS1vhX0<$BwMb<!8}UC
zRPHgA#8eulvS%s>rqXArO`i<9^o<OiE`6VBt-ri%nk<R)nO>Il#^&=|R!9+{^mU9y
zo;I7N)k_n=$>?vyltzC7m+w+^fi8t07Ow0lx^7R=H8&-~GC)0-Mo-snA(c5zjl6ES
zi>f%HDlm6Vbf`-9sLI8c-$#dNN)ej!*a8Ij()V!5f1k4*nYt>!H>!N8OS;u%-PQ0g
zzeBrlJ~;B9by6lGwHJ{`5qTyeuaC$ZBJy08T46lQv(?1&_7H!3La^Jz4#DR=f={mU
zu})r4=%iiM8kzXU9DK>9q19jq&nJ`cjY;^uN%(_F_*7DKcL~R2KHzNeadzo^Y+v%S
zIBu6Gj^{eR3g>ba=gvi0>#bUj8*u(J8Xz1vI1qSnAnBCA?G6r9e{kU8!LztnJ;x@F
zntaqZ1Og<mYF~eJ(PjxU!SzFNg`{+7ln#5P!$IkgYUg^jeAM;LGm$2r4o%sF9-E3o
zfFyiq-|mG6J}3_y-avjXQ>w^8iN^T8b!jdS9{}9=HMfS%2gl}H%jN+~Elc3xfYMO6
ziE>?-n+4Qga051&X{Y<4dcP~%IA3H<_LysXapu_{`hR~}19WZZT_3WIsOv=AR`jM9
zVKeF~AJEIX(g(5UGI*N_NEn|1(Hjkj!D&E{)f|q^^hwVG`)uKI>>_vq&Vs-2^U)g%
zomX+9Pxm#-ZJwX9=C!kmOTEq#J-r;7-NpI8?^IwL49NY!r3qZxz~vCQ+y+jap;Hih
zL$4q;hh2Z5zyO(k0p#NL74+{O2wmLTs)?9Lp`#NP`uPHL>xRfipjF|DVx(6uu4~0b
zQ(t(lD_q5ubj`jUf$<INvNwH!%}s$B2phlJk6)Sim5pBw@vCk8%JvvcMsBZx>b6je
zq0*=JycK)2BfB+g*mr9%b`93AVK8jiIyP)A8@4x|4g01I#<jug-Wlv;YusR*d!cLk
lmx?G^*T(LJVot;)6r4&G-TJMPX0Q*FKLJM$9?|m(005JgYa##u

delta 925
zcmV;O17iIA3DgG%ABzYGAp@n62S<NZO>f&c5WVwP7{1t9#0rNWq8Om3G(`if+eI8C
z7XyN#u&Nr_QYG14Z_)q0GnC}kYId=U8unPEsHgYdaE57GR)@HD8N-m4+or8|X<OE;
z;%uI7%Y72Gu4$X#<Dqi(KG>A$b5)mr9@rAESOqMN<HucIwD~rUS^4<Mr7eG}1bf$3
zlHFE{&7UgGR<k%sQ`a<cTJE;(j8!4sFs#8l`=r>p2InH0v$*(Sd4ogXGzP$l`5M1#
z3}+P2C)2O=zbUu*v#aUyazgRqBDko_vc34S$!Yv;dPb|)v#;OQvonGeY+h6#S%%md
zu*?$$g-k*Fw}mY8)Bw3<o)CXTNZ|9%)dvEwG$r_toTjVm-><LkCcjPI+`eB<maBYq
zwYs_4=53y!mGKI7=jHaQNSbEy(&ypr_3icKE~zuuzDqXl)w=u4^3U5qaNrBzL0M-(
zSvky5l0IMV%VM{2izoTPS`A{6e9*8^iP4M1IanAQ8SOZPpzQ!QJ@0?bqlkuJ9JwQa
z+!5l`9YJ{%K9NHA?uc-3M;J<OoVTuyW5S3$hNUPuL&=Z$qwxQ;nC6?kcrlOCGnFHz
zl9)=*R1Qq#k*PE+>(VEqK7CV9r%&IT+PObI9-2H&ily6>^`Xn>mwYQljMmo)Zt|=-
zG_Bis0cX>HF;jXA6hD8ZsDO$>5DO)Hib@R>m9LZ-w*mUO@qVgq3AxN^=<QYZ6jgIX
z)!=JQ^r%`6s9NE}KdVDDtqDzs>>juc4d$-W=I5N9*mPI6NpYVy`D5WapjG~t`z5Qi
z7o|s{LJ}2vQQ;seJc<ex%Q|mDOm$~V7>*DOA#}@ak6`$KV5onwysQQ}8Q&?4WcL!3
z7F^+!`iJd2{b2{Ksw8#iV@rxMBjca)=DDx-*KVJu?&kHe)~_!Ad!ZViH#3rJNUrI$
z4RWKS+z1B4A~6^ijT&J@jWF_!Fd7<RbZmrC)bAs&k@~gY;+CUF2HTX>QG~da1xEJt
zMp|#AMI%GSwN`&T)Hqey6Eku7gE#8^uy<B|@6hvJs~u^zq}6r@#-J7WQ7mxqm4u!b
zzKnp2ZeCL9Pv^b~efM;Fa!6pZ>6GAlbWHG&&IxWhr0DosdweY(S-r^sFt`jb>QeyJ
zr~p*AaA;Kk;ddY^_<L8=!9kRuN3v*RAOb5;E1qU24Ymyn-9_*>OvA61*#`gsf_2)m

diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py
index 36f153531..c3091e1b7 100644
--- a/nova/tests/test_hypervapi.py
+++ b/nova/tests/test_hypervapi.py
@@ -76,7 +76,7 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
         fake_image.stub_out_image_service(self.stubs)
         fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs)
 
-        def fake_dumps(msg):
+        def fake_dumps(msg, default=None, **kwargs):
             return '""'
         self.stubs.Set(json, 'dumps', fake_dumps)
 
@@ -108,7 +108,8 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
             'multiprocessing',
             '_winreg',
             'nova.virt.configdrive',
-            'nova.utils'
+            'nova.utils',
+            'ctypes'
         ]
 
         # Modules in which the mocks are going to be injected