From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Fehlig Subject: [PATCH] [xend] Fix casing of various functions in XendAPI class Date: Tue, 14 Nov 2006 16:34:04 -0700 Message-ID: <455A526C.9070803@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050800030304050703080909" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen-devel List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------050800030304050703080909 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit I have been unable to execute many of the new Xen API RPCs, such as host.get_resident_VMs(), host.get_host_CPUs(), etc. I have tracked this down to some casing issues in class XendAPI. This patch removes the lower-casing of class attribute names in the initialization method of XendAPI and fixes any discrepancies between the attribute names and corresponding method definitions. With this patch I am now able to execute (via libxen) many of the RPCs that previously did not work. An alternative approach would be to preserve the lower-casing in XendAPI initialization method and change all of the attribute names and corresponding method definitions to lower-case. I can rework the path if this is the desired approach. Regards, Jim --------------050800030304050703080909 Content-Type: text/x-patch; name="xend-xenapi-case.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="xend-xenapi-case.patch" IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIGpmZWhsaWdAamZlaGxpZzIucHJvdm8ubm92 ZWxsLmNvbQojIERhdGUgMTE2MzU0MzgwMSAyNTIwMAojIE5vZGUgSUQgODM0NzE0ZjllNjFj NDc0NTQ2ZDFmYWJmNGNlMWU1ODAzNDViZDFkMgojIFBhcmVudCAgOWEzNDFjNmVmNmFlMmNl OTBjY2RjZjg5NzE4ZDQzNjU0MjZkOWQ5NgpGaXggY2FzaW5nIG9mIHZhcmlvdXMgZnVuY3Rp b25zIGluIFhlbmRBUEkgY2xhc3MuCgpTaWduZWQtb2ZmLWJ5OiBKaW0gRmVobGlnIDxqZmVo bGlnQG5vdmVsbC5jb20+CgpkaWZmIC1yIDlhMzQxYzZlZjZhZSAtciA4MzQ3MTRmOWU2MWMg dG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmRBUEkucHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hl bi94ZW5kL1hlbmRBUEkucHkJTW9uIE5vdiAxMyAxNDoyNTo0OCAyMDA2ICswMDAwCisrKyBi L3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kQVBJLnB5CVR1ZSBOb3YgMTQgMTU6MzY6NDEg MjAwNiAtMDcwMApAQCAtMzIzLDcgKzMyMyw3IEBAIGNsYXNzIFhlbmRBUEk6CiAKICAgICAg ICAgICAgICMgd3JhcCB2YWxpZGF0b3JzIGFyb3VuZCByZWFkYWJsZSBjbGFzcyBhdHRyaWJ1 dGVzCiAgICAgICAgICAgICBmb3IgYXR0cl9uYW1lIGluIHJvX2F0dHJzICsgcndfYXR0cnMg KyBzZWxmLkJhc2VfYXR0cl9ybzoKLSAgICAgICAgICAgICAgICBnZXR0ZXJfbmFtZSA9ICcl c19nZXRfJXMnICUgKGNscy5sb3dlcigpLCBhdHRyX25hbWUubG93ZXIoKSkKKyAgICAgICAg ICAgICAgICBnZXR0ZXJfbmFtZSA9ICclc19nZXRfJXMnICUgKGNscy5sb3dlcigpLCBhdHRy X25hbWUpCiAgICAgICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgICAgICBnZXR0 ZXIgPSBnZXRhdHRyKFhlbmRBUEksIGdldHRlcl9uYW1lKQogICAgICAgICAgICAgICAgICAg ICBmb3IgdmFsaWRhdG9yIGluIHZhbGlkYXRvcnM6CkBAIC0zMzYsNyArMzM2LDcgQEAgY2xh c3MgWGVuZEFQSToKIAogICAgICAgICAgICAgIyB3cmFwIHZhbGlkYXRvcnMgYXJvdW5kIHdy aXRhYmxlIGNsYXNzIGF0dHJyaWJ1dGVzCiAgICAgICAgICAgICBmb3IgYXR0cl9uYW1lIGlu IHJ3X2F0dHJzICsgc2VsZi5CYXNlX2F0dHJfcnc6Ci0gICAgICAgICAgICAgICAgc2V0dGVy X25hbWUgPSAnJXNfc2V0XyVzJyAlIChjbHMubG93ZXIoKSwgYXR0cl9uYW1lLmxvd2VyKCkp CisgICAgICAgICAgICAgICAgc2V0dGVyX25hbWUgPSAnJXNfc2V0XyVzJyAlIChjbHMubG93 ZXIoKSwgYXR0cl9uYW1lKQogICAgICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAg ICAgICAgc2V0dGVyID0gZ2V0YXR0cihYZW5kQVBJLCBzZXR0ZXJfbmFtZSkKICAgICAgICAg ICAgICAgICAgICAgZm9yIHZhbGlkYXRvciBpbiB2YWxpZGF0b3JzOgpAQCAtMzQ5LDcgKzM0 OSw3IEBAIGNsYXNzIFhlbmRBUEk6CiAKICAgICAgICAgICAgICMgd3JhcCB2YWxpZGF0b3Jz IGFyb3VuZCBtZXRob2RzCiAgICAgICAgICAgICBmb3IgbWV0aG9kX25hbWUgaW4gbWV0aG9k cyArIHNlbGYuQmFzZV9tZXRob2RzOgotICAgICAgICAgICAgICAgIG1ldGhvZF9mdWxsX25h bWUgPSAnJXNfJXMnICUgKGNscy5sb3dlcigpLG1ldGhvZF9uYW1lLmxvd2VyKCkpCisgICAg ICAgICAgICAgICAgbWV0aG9kX2Z1bGxfbmFtZSA9ICclc18lcycgJSAoY2xzLmxvd2VyKCks IG1ldGhvZF9uYW1lKQogICAgICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICAg ICAgbWV0aG9kID0gZ2V0YXR0cihYZW5kQVBJLCBtZXRob2RfZnVsbF9uYW1lKQogICAgICAg ICAgICAgICAgICAgICBmb3IgdmFsaWRhdG9yIGluIHZhbGlkYXRvcnM6CkBAIC0zNjIsNyAr MzYyLDcgQEAgY2xhc3MgWGVuZEFQSToKIAogICAgICAgICAgICAgIyB3cmFwIHZhbGlkYXRv cnMgYXJvdW5kIGNsYXNzIGZ1bmN0aW9ucwogICAgICAgICAgICAgZm9yIGZ1bmNfbmFtZSBp biBmdW5jcyArIHNlbGYuQmFzZV9mdW5jczoKLSAgICAgICAgICAgICAgICBmdW5jX2Z1bGxf bmFtZSA9ICclc18lcycgJSAoY2xzLmxvd2VyKCksIGZ1bmNfbmFtZS5sb3dlcigpKQorICAg ICAgICAgICAgICAgIGZ1bmNfZnVsbF9uYW1lID0gJyVzXyVzJyAlIChjbHMubG93ZXIoKSwg ZnVuY19uYW1lKQogICAgICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICAgICAg bWV0aG9kID0gZ2V0YXR0cihYZW5kQVBJLCBmdW5jX2Z1bGxfbmFtZSkKICAgICAgICAgICAg ICAgICAgICAgbWV0aG9kID0gc2Vzc2lvbl9yZXF1aXJlZChtZXRob2QpCkBAIC00MDUsNyAr NDA1LDcgQEAgY2xhc3MgWGVuZEFQSToKICAgICAgICAgcmVjb3JkID0geyd0aGlzX2hvc3Qn OiBYZW5kTm9kZS5pbnN0YW5jZSgpLnV1aWQsCiAgICAgICAgICAgICAgICAgICAndGhpc191 c2VyJzogYXV0aF9tYW5hZ2VyKCkuZ2V0X3VzZXIoc2Vzc2lvbil9CiAgICAgICAgIHJldHVy biB4ZW5fYXBpX3N1Y2Nlc3MocmVjb3JkKQotICAgIGRlZiBzZXNzaW9uX3RvX3htbChzZWxm LCBzZXNzaW9uKToKKyAgICBkZWYgc2Vzc2lvbl90b19YTUwoc2VsZiwgc2Vzc2lvbik6CiAg ICAgICAgIHJldHVybiB4ZW5fYXBpX3RvZG8oKQogCiAgICAgIyBhdHRyaWJ1dGVzIChybykK QEAgLTUyOSw3ICs1MjksNyBAQCBjbGFzcyBYZW5kQVBJOgogICAgICAgICAgICAgICAgICAg J2ZlYXR1cmVzJzogbm9kZS5nZXRfaG9zdF9jcHVfZmVhdHVyZXMoaG9zdF9jcHVfcmVmKSwK ICAgICAgICAgICAgICAgICAgICd1dGlsaXNhdGlvbic6IG5vZGUuZ2V0X2hvc3RfY3B1X2xv YWQoaG9zdF9jcHVfcmVmKX0KICAgICAgICAgcmV0dXJuIHhlbl9hcGlfc3VjY2VzcyhyZWNv cmQpCi0gICAgZGVmIGhvc3RfY3B1X3RvX3htbChzZWxmLCBzZXNzaW9uLCBob3N0X2NwdV9y ZWYpOgorICAgIGRlZiBob3N0X2NwdV90b19YTUwoc2VsZiwgc2Vzc2lvbiwgaG9zdF9jcHVf cmVmKToKICAgICAgICAgcmV0dXJuIHhlbl9hcGlfdG9kbygpCiAKICAgICAjIGNsYXNzIG1l dGhvZHMKQEAgLTU3OSw3ICs1NzksNyBAQCBjbGFzcyBYZW5kQVBJOgogICAgICAgICAgICAg ICAgICAgJ1ZDUFVzX3BvbGljeScsCiAgICAgICAgICAgICAgICAgICAnVkNQVXNfcGFyYW1z JywKICAgICAgICAgICAgICAgICAgICdWQ1BVc19mZWF0dXJlc19mb3JjZV9vbicsCi0gICAg ICAgICAgICAgICAgICAnVkNQVVNfZmVhdHVyZXNfZm9yY2Vfb2ZmJywKKyAgICAgICAgICAg ICAgICAgICdWQ1BVc19mZWF0dXJlc19mb3JjZV9vZmYnLAogICAgICAgICAgICAgICAgICAg J2FjdGlvbnNfYWZ0ZXJfc2h1dGRvd24nLAogICAgICAgICAgICAgICAgICAgJ2FjdGlvbnNf YWZ0ZXJfcmVib290JywKICAgICAgICAgICAgICAgICAgICdhY3Rpb25zX2FmdGVyX3N1c3Bl bmQnLApAQCAtODM1LDE5ICs4MzUsMTkgQEAgY2xhc3MgWGVuZEFQSToKICAgICAgICAgZG9t ID0gWGVuZERvbWFpbi5pbnN0YW5jZSgpLmdldF92bV9ieV91dWlkKHZtX3JlZikKICAgICAg ICAgcmV0dXJuIHhlbl9hcGlfc3VjY2Vzc192b2lkKCkKICAgICAKLSAgICBkZWYgdm1fc2V0 X3ZjcHVzX3BvbGljeShzZWxmLCBzZXNzaW9uLCB2bV9yZWYpOgotICAgICAgICBkb20gPSBY ZW5kRG9tYWluLmluc3RhbmNlKCkuZ2V0X3ZtX2J5X3V1aWQodm1fcmVmKQotICAgICAgICBy ZXR1cm4geGVuX2FwaV9zdWNjZXNzX3ZvaWQoKQotICAgIAotICAgIGRlZiB2bV9zZXRfdmNw dXNfcGFyYW1zKHNlbGYsIHNlc3Npb24sIHZtX3JlZik6Ci0gICAgICAgIGRvbSA9IFhlbmRE b21haW4uaW5zdGFuY2UoKS5nZXRfdm1fYnlfdXVpZCh2bV9yZWYpCi0gICAgICAgIHJldHVy biB4ZW5fYXBpX3N1Y2Nlc3Nfdm9pZCgpCi0gICAgCi0gICAgZGVmIHZtX3NldF92Y3B1c19m ZWF0dXJlc19mb3JjZV9vbihzZWxmLCBzZXNzaW9uLCB2bV9yZWYpOgotICAgICAgICBkb20g PSBYZW5kRG9tYWluLmluc3RhbmNlKCkuZ2V0X3ZtX2J5X3V1aWQodm1fcmVmKQotICAgICAg ICByZXR1cm4geGVuX2FwaV9zdWNjZXNzX3ZvaWQoKQotICAgIAotICAgIGRlZiB2bV9zZXRf dmNwdXNfZmVhdHVyZXNfZm9yY2Vfb2ZmKHNlbGYsIHNlc3Npb24sIHZtX3JlZik6CisgICAg ZGVmIHZtX3NldF9WQ1BVc19wb2xpY3koc2VsZiwgc2Vzc2lvbiwgdm1fcmVmKToKKyAgICAg ICAgZG9tID0gWGVuZERvbWFpbi5pbnN0YW5jZSgpLmdldF92bV9ieV91dWlkKHZtX3JlZikK KyAgICAgICAgcmV0dXJuIHhlbl9hcGlfc3VjY2Vzc192b2lkKCkKKyAgICAKKyAgICBkZWYg dm1fc2V0X1ZDUFVzX3BhcmFtcyhzZWxmLCBzZXNzaW9uLCB2bV9yZWYpOgorICAgICAgICBk b20gPSBYZW5kRG9tYWluLmluc3RhbmNlKCkuZ2V0X3ZtX2J5X3V1aWQodm1fcmVmKQorICAg ICAgICByZXR1cm4geGVuX2FwaV9zdWNjZXNzX3ZvaWQoKQorICAgIAorICAgIGRlZiB2bV9z ZXRfVkNQVXNfZmVhdHVyZXNfZm9yY2Vfb24oc2VsZiwgc2Vzc2lvbiwgdm1fcmVmKToKKyAg ICAgICAgZG9tID0gWGVuZERvbWFpbi5pbnN0YW5jZSgpLmdldF92bV9ieV91dWlkKHZtX3Jl ZikKKyAgICAgICAgcmV0dXJuIHhlbl9hcGlfc3VjY2Vzc192b2lkKCkKKyAgICAKKyAgICBk ZWYgdm1fc2V0X1ZDUFVzX2ZlYXR1cmVzX2ZvcmNlX29mZihzZWxmLCBzZXNzaW9uLCB2bV9y ZWYpOgogICAgICAgICBkb20gPSBYZW5kRG9tYWluLmluc3RhbmNlKCkuZ2V0X3ZtX2J5X3V1 aWQodm1fcmVmKQogICAgICAgICByZXR1cm4geGVuX2FwaV9zdWNjZXNzX3ZvaWQoKQogICAg IApAQCAtOTM3LDcgKzkzNyw3IEBAIGNsYXNzIFhlbmRBUEk6CiAgICAgICAgIHJldHVybiB4 ZW5fYXBpX3N1Y2Nlc3MoZG9tdXVpZCkKICAgICAKICAgICAjIG9iamVjdCBtZXRob2RzCi0g ICAgZGVmIHZtX3RvX3htbChzZWxmLCBzZXNzaW9uLCB2bV9yZWYpOgorICAgIGRlZiB2bV90 b19YTUwoc2VsZiwgc2Vzc2lvbiwgdm1fcmVmKToKICAgICAgICAgcmV0dXJuIHhlbl9hcGlf dG9kbygpCiAgICAgCiAgICAgZGVmIHZtX2dldF9yZWNvcmQoc2VsZiwgc2Vzc2lvbiwgdm1f cmVmKToKQEAgLTEwNzgsMTEgKzEwNzgsMTEgQEAgY2xhc3MgWGVuZEFQSToKICAgICAgICAg cmV0dXJuIHhlbl9hcGlfc3VjY2Vzcyh2YmRfcmVmKQogCiAgICAgIyBhdHRyaWJ1dGVzIChy dykKLSAgICBkZWYgdmJkX2dldF92bShzZWxmLCBzZXNzaW9uLCB2YmRfcmVmKToKKyAgICBk ZWYgdmJkX2dldF9WTShzZWxmLCBzZXNzaW9uLCB2YmRfcmVmKToKICAgICAgICAgeGVuZG9t ID0gWGVuZERvbWFpbi5pbnN0YW5jZSgpCiAgICAgICAgIHJldHVybiB4ZW5fYXBpX3N1Y2Nl c3MoeGVuZG9tLmdldF9kZXZfcHJvcGVydHkoJ3ZiZCcsIHZiZF9yZWYsICdWTScpKQogICAg IAotICAgIGRlZiB2YmRfZ2V0X3ZkaShzZWxmLCBzZXNzaW9uLCB2YmRfcmVmKToKKyAgICBk ZWYgdmJkX2dldF9WREkoc2VsZiwgc2Vzc2lvbiwgdmJkX3JlZik6CiAgICAgICAgIHJldHVy biB4ZW5fYXBpX3RvZG8oKQogICAgIAogICAgIGRlZiB2YmRfZ2V0X2RldmljZShzZWxmLCBz ZXNzaW9uLCB2YmRfcmVmKToKQEAgLTEyMDQsNyArMTIwNCw3IEBAIGNsYXNzIFhlbmRBUEk6 CiAgICAgICAgIGltYWdlID0gc3IueGVuX2FwaV9nZXRfYnlfdXVpZCh2ZGlfcmVmKQogICAg ICAgICByZXR1cm4geGVuX2FwaV9zdWNjZXNzKGltYWdlLm5hbWVfZGVzY3JpcHRpb24pCiAK LSAgICBkZWYgdmRpX2dldF9zcihzZWxmLCBzZXNzaW9uLCB2ZGlfcmVmKToKKyAgICBkZWYg dmRpX2dldF9TUihzZWxmLCBzZXNzaW9uLCB2ZGlfcmVmKToKICAgICAgICAgc3IgPSBYZW5k Tm9kZS5pbnN0YW5jZSgpLmdldF9zcigpCiAgICAgICAgIHJldHVybiB4ZW5fYXBpX3N1Y2Nl c3Moc3IudXVpZCkKIApAQCAtMTIzNSw3ICsxMjM1LDcgQEAgY2xhc3MgWGVuZEFQSToKICAg ICAgICAgaW1hZ2UubmFtZV9kZXNjcmlwdGlvbiA9IHZhbHVlCiAgICAgICAgIHJldHVybiB4 ZW5fYXBpX3N1Y2Nlc3Nfdm9pZCgpCiAKLSAgICBkZWYgdmRpX3NldF9zcihzZWxmLCBzZXNz aW9uLCB2ZGlfcmVmLCB2YWx1ZSk6CisgICAgZGVmIHZkaV9zZXRfU1Ioc2VsZiwgc2Vzc2lv biwgdmRpX3JlZiwgdmFsdWUpOgogICAgICAgICByZXR1cm4geGVuX2FwaV9lcnJvcihYRU5E X0VSUk9SX1VOU1VQUE9SVEVEKQogCiAgICAgZGVmIHZkaV9zZXRfdmlydHVhbF9zaXplKHNl bGYsIHNlc3Npb24sIHZkaV9yZWYsIHZhbHVlKToKQEAgLTEyNTUsNyArMTI1NSw3IEBAIGNs YXNzIFhlbmRBUEk6CiAgICAgICAgIHNyLmRlc3Ryb3lfaW1hZ2UodmRpX3JlZikKICAgICAg ICAgcmV0dXJuIHhlbl9hcGlfc3VjY2Vzc192b2lkKCkKIAotICAgIGRlZiB2ZGlfdG9feG1s KHNlbGYsIHNlc3Npb24sIHZkaV9yZWYpOgorICAgIGRlZiB2ZGlfdG9fWE1MKHNlbGYsIHNl c3Npb24sIHZkaV9yZWYpOgogICAgICAgICByZXR1cm4geGVuX2FwaV90b2RvKCkKICAgICAK ICAgICBkZWYgdmRpX2dldF9yZWNvcmQoc2VsZiwgc2Vzc2lvbiwgdmRpX3JlZik6CkBAIC0x NDM0LDcgKzE0MzQsNyBAQCBjbGFzcyBYZW5kQVBJOgogICAgIGRlZiBzcl9kZXN0cm95KHNl bGYsIHNlc3Npb24sIHNyX3JlZik6CiAgICAgICAgIHJldHVybiB4ZW5fYXBpX2Vycm9yKFhF TkRfRVJST1JfVU5TVVBQT1JURUQpCiAgICAgCi0gICAgZGVmIHNyX3RvX3htbChzZWxmLCBz ZXNzaW9uLCBzcl9yZWYpOgorICAgIGRlZiBzcl90b19YTUwoc2VsZiwgc2Vzc2lvbiwgc3Jf cmVmKToKICAgICAgICAgcmV0dXJuIHhlbl9hcGlfdG9kbygpCiAgICAgCiAgICAgZGVmIHNy X2dldF9yZWNvcmQoc2VsZiwgc2Vzc2lvbiwgc3JfcmVmKToKQEAgLTE0NTIsNyArMTQ1Miw3 IEBAIGNsYXNzIFhlbmRBUEk6CiAgICAgICAgICAgICB9KQogCiAgICAgIyBBdHRyaWJ1dGUg YWNjZWVzcwotICAgIGRlZiBzcl9nZXRfdmRpcyhzZWxmLCBzZXNzaW9uLCBzcl9yZWYpOgor ICAgIGRlZiBzcl9nZXRfVkRJcyhzZWxmLCBzZXNzaW9uLCBzcl9yZWYpOgogICAgICAgICBz ciA9IFhlbmROb2RlLmluc3RhbmNlKCkuZ2V0X3NyKCkKICAgICAgICAgcmV0dXJuIHhlbl9h cGlfc3VjY2Vzcyhzci5saXN0X2ltYWdlcygpKQogCg== --------------050800030304050703080909 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------050800030304050703080909--