https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114744
Revision: 114744
Author: laner
Date: 2012-04-05 18:05:49 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
Fix a memcache key and disable filtering support, since it isn't supported in
nova.
Modified Paths:
--------------
trunk/extensions/OpenStackManager/OpenStackNovaController.php
trunk/extensions/OpenStackManager/OpenStackNovaUser.php
Modified: trunk/extensions/OpenStackManager/OpenStackNovaController.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaController.php
2012-04-05 17:56:17 UTC (rev 114743)
+++ trunk/extensions/OpenStackManager/OpenStackNovaController.php
2012-04-05 18:05:49 UTC (rev 114744)
@@ -94,12 +94,13 @@
function getInstances( $instanceId = null, $project = array() ) {
$this->instances = array();
$opt = array();
- if ( $instanceId ) {
- $opt['InstanceId'] = $instanceId;
- }
- if ( $project ) {
- $opt = array( 'Filter' => array( array( 'Name' =>
'project_id', 'Value' => $project ) ) );
- }
+ ## Filtering support is currently missing in nova, pull all
instances
+ #if ( $instanceId ) {
+ # $opt['InstanceId'] = $instanceId;
+ #}
+ #if ( $project ) {
+ # $opt = array( 'Filter' => array( array( 'Name' =>
'project_id', 'Value' => $project ) ) );
+ #}
$response = $this->novaConnection->describe_instances( $opt );
$instances = $response->body->reservationSet->item;
foreach ( $instances as $instance ) {
Modified: trunk/extensions/OpenStackManager/OpenStackNovaUser.php
===================================================================
--- trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2012-04-05
17:56:17 UTC (rev 114743)
+++ trunk/extensions/OpenStackManager/OpenStackNovaUser.php 2012-04-05
18:05:49 UTC (rev 114744)
@@ -148,7 +148,7 @@
global $wgOpenStackManagerLDAPProjectBaseDN;
global $wgMemc;
- $key = wfMemcKey( 'openstackmanager', "project-$projectname",
$this->userDN );
+ $key = wfMemcKey( 'openstackmanager', "project-$project",
$this->userDN );
$cacheLength = 3600;
$inProject = $wgMemc->get( $key );
if ( is_int( $inProject ) ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
