Ryan Lane has submitted this change and it was merged.
Change subject: Move OpenStackNova files to nova folder
......................................................................
Move OpenStackNova files to nova folder
Less clutter!
Remove require_once for OpenStackNovaProject, was in autoloader code
Change-Id: I28133fa6b42519335fe6cf54ae5f3ea96474b12b
---
M OpenStackManager.php
R nova/OpenStackNovaAddress.php
R nova/OpenStackNovaArticle.php
R nova/OpenStackNovaController.php
R nova/OpenStackNovaDomain.php
R nova/OpenStackNovaHost.php
R nova/OpenStackNovaHostJob.php
R nova/OpenStackNovaImage.php
R nova/OpenStackNovaInstance.php
R nova/OpenStackNovaInstanceType.php
R nova/OpenStackNovaKeypair.php
R nova/OpenStackNovaLdapConnection.php
R nova/OpenStackNovaProject.php
R nova/OpenStackNovaProjectGroup.php
R nova/OpenStackNovaPuppetGroup.php
R nova/OpenStackNovaRole.php
R nova/OpenStackNovaSecurityGroup.php
R nova/OpenStackNovaSecurityGroupRule.php
R nova/OpenStackNovaSudoer.php
R nova/OpenStackNovaUser.php
R nova/OpenStackNovaVolume.php
21 files changed, 20 insertions(+), 22 deletions(-)
Approvals:
Ryan Lane: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/OpenStackManager.php b/OpenStackManager.php
index 8d23969..b75c954 100644
--- a/OpenStackManager.php
+++ b/OpenStackManager.php
@@ -121,26 +121,26 @@
$wgExtensionMessagesFiles['OpenStackManager'] = $dir .
'OpenStackManager.i18n.php';
$wgExtensionMessagesFiles['OpenStackManagerAlias'] = $dir .
'OpenStackManager.alias.php';
-$wgAutoloadClasses['OpenStackNovaInstance'] = $dir .
'OpenStackNovaInstance.php';
-$wgAutoloadClasses['OpenStackNovaInstanceType'] = $dir .
'OpenStackNovaInstanceType.php';
-$wgAutoloadClasses['OpenStackNovaImage'] = $dir . 'OpenStackNovaImage.php';
-$wgAutoloadClasses['OpenStackNovaKeypair'] = $dir . 'OpenStackNovaKeypair.php';
-$wgAutoloadClasses['OpenStackNovaController'] = $dir .
'OpenStackNovaController.php';
-$wgAutoloadClasses['OpenStackNovaUser'] = $dir . 'OpenStackNovaUser.php';
-$wgAutoloadClasses['OpenStackNovaDomain'] = $dir . 'OpenStackNovaDomain.php';
-$wgAutoloadClasses['OpenStackNovaHost'] = $dir . 'OpenStackNovaHost.php';
-$wgAutoloadClasses['OpenStackNovaAddress'] = $dir . 'OpenStackNovaAddress.php';
-$wgAutoloadClasses['OpenStackNovaSecurityGroup'] = $dir .
'OpenStackNovaSecurityGroup.php';
-$wgAutoloadClasses['OpenStackNovaSecurityGroupRule'] = $dir .
'OpenStackNovaSecurityGroupRule.php';
-$wgAutoloadClasses['OpenStackNovaRole'] = $dir . 'OpenStackNovaRole.php';
-$wgAutoloadClasses['OpenStackNovaVolume'] = $dir . 'OpenStackNovaVolume.php';
-$wgAutoloadClasses['OpenStackNovaSudoer'] = $dir . 'OpenStackNovaSudoer.php';
-$wgAutoloadClasses['OpenStackNovaArticle'] = $dir . 'OpenStackNovaArticle.php';
-$wgAutoloadClasses['OpenStackNovaHostJob'] = $dir . 'OpenStackNovaHostJob.php';
-$wgAutoloadClasses['OpenStackNovaPuppetGroup'] = $dir .
'OpenStackNovaPuppetGroup.php';
-$wgAutoloadClasses['OpenStackNovaLdapConnection'] = $dir .
'OpenStackNovaLdapConnection.php';
-$wgAutoloadClasses['OpenStackNovaProject'] = $dir . 'OpenStackNovaProject.php';
-$wgAutoloadClasses['OpenStackNovaProjectGroup'] = $dir .
'OpenStackNovaProjectGroup.php';
+$wgAutoloadClasses['OpenStackNovaInstance'] = $dir .
'nova/OpenStackNovaInstance.php';
+$wgAutoloadClasses['OpenStackNovaInstanceType'] = $dir .
'nova/OpenStackNovaInstanceType.php';
+$wgAutoloadClasses['OpenStackNovaImage'] = $dir .
'nova/OpenStackNovaImage.php';
+$wgAutoloadClasses['OpenStackNovaKeypair'] = $dir .
'nova/OpenStackNovaKeypair.php';
+$wgAutoloadClasses['OpenStackNovaController'] = $dir .
'nova/OpenStackNovaController.php';
+$wgAutoloadClasses['OpenStackNovaUser'] = $dir . 'nova/OpenStackNovaUser.php';
+$wgAutoloadClasses['OpenStackNovaDomain'] = $dir .
'nova/OpenStackNovaDomain.php';
+$wgAutoloadClasses['OpenStackNovaHost'] = $dir . 'nova/OpenStackNovaHost.php';
+$wgAutoloadClasses['OpenStackNovaAddress'] = $dir .
'nova/OpenStackNovaAddress.php';
+$wgAutoloadClasses['OpenStackNovaSecurityGroup'] = $dir .
'nova/OpenStackNovaSecurityGroup.php';
+$wgAutoloadClasses['OpenStackNovaSecurityGroupRule'] = $dir .
'nova/OpenStackNovaSecurityGroupRule.php';
+$wgAutoloadClasses['OpenStackNovaRole'] = $dir . 'nova/OpenStackNovaRole.php';
+$wgAutoloadClasses['OpenStackNovaVolume'] = $dir .
'nova/OpenStackNovaVolume.php';
+$wgAutoloadClasses['OpenStackNovaSudoer'] = $dir .
'nova/OpenStackNovaSudoer.php';
+$wgAutoloadClasses['OpenStackNovaArticle'] = $dir .
'nova/OpenStackNovaArticle.php';
+$wgAutoloadClasses['OpenStackNovaHostJob'] = $dir .
'nova/OpenStackNovaHostJob.php';
+$wgAutoloadClasses['OpenStackNovaPuppetGroup'] = $dir .
'nova/OpenStackNovaPuppetGroup.php';
+$wgAutoloadClasses['OpenStackNovaLdapConnection'] = $dir .
'nova/OpenStackNovaLdapConnection.php';
+$wgAutoloadClasses['OpenStackNovaProject'] = $dir .
'nova/OpenStackNovaProject.php';
+$wgAutoloadClasses['OpenStackNovaProjectGroup'] = $dir .
'nova/OpenStackNovaProjectGroup.php';
$wgAutoloadClasses['SpecialNovaInstance'] = $dir .
'special/SpecialNovaInstance.php';
$wgAutoloadClasses['SpecialNovaKey'] = $dir . 'special/SpecialNovaKey.php';
$wgAutoloadClasses['SpecialNovaProject'] = $dir .
'special/SpecialNovaProject.php';
@@ -191,8 +191,6 @@
$wgResourceModules['ext.openstack'] = array(
'styles' => 'ext.openstack.css',
) + $commonModuleInfo;
-
-require_once( $dir . 'OpenStackNovaProject.php' );
# Schema changes
$wgHooks['LoadExtensionSchemaUpdates'][] = 'efOpenStackSchemaUpdates';
diff --git a/OpenStackNovaAddress.php b/nova/OpenStackNovaAddress.php
similarity index 100%
rename from OpenStackNovaAddress.php
rename to nova/OpenStackNovaAddress.php
diff --git a/OpenStackNovaArticle.php b/nova/OpenStackNovaArticle.php
similarity index 100%
rename from OpenStackNovaArticle.php
rename to nova/OpenStackNovaArticle.php
diff --git a/OpenStackNovaController.php b/nova/OpenStackNovaController.php
similarity index 100%
rename from OpenStackNovaController.php
rename to nova/OpenStackNovaController.php
diff --git a/OpenStackNovaDomain.php b/nova/OpenStackNovaDomain.php
similarity index 100%
rename from OpenStackNovaDomain.php
rename to nova/OpenStackNovaDomain.php
diff --git a/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
similarity index 100%
rename from OpenStackNovaHost.php
rename to nova/OpenStackNovaHost.php
diff --git a/OpenStackNovaHostJob.php b/nova/OpenStackNovaHostJob.php
similarity index 100%
rename from OpenStackNovaHostJob.php
rename to nova/OpenStackNovaHostJob.php
diff --git a/OpenStackNovaImage.php b/nova/OpenStackNovaImage.php
similarity index 100%
rename from OpenStackNovaImage.php
rename to nova/OpenStackNovaImage.php
diff --git a/OpenStackNovaInstance.php b/nova/OpenStackNovaInstance.php
similarity index 100%
rename from OpenStackNovaInstance.php
rename to nova/OpenStackNovaInstance.php
diff --git a/OpenStackNovaInstanceType.php b/nova/OpenStackNovaInstanceType.php
similarity index 100%
rename from OpenStackNovaInstanceType.php
rename to nova/OpenStackNovaInstanceType.php
diff --git a/OpenStackNovaKeypair.php b/nova/OpenStackNovaKeypair.php
similarity index 100%
rename from OpenStackNovaKeypair.php
rename to nova/OpenStackNovaKeypair.php
diff --git a/OpenStackNovaLdapConnection.php
b/nova/OpenStackNovaLdapConnection.php
similarity index 100%
rename from OpenStackNovaLdapConnection.php
rename to nova/OpenStackNovaLdapConnection.php
diff --git a/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
similarity index 100%
rename from OpenStackNovaProject.php
rename to nova/OpenStackNovaProject.php
diff --git a/OpenStackNovaProjectGroup.php b/nova/OpenStackNovaProjectGroup.php
similarity index 100%
rename from OpenStackNovaProjectGroup.php
rename to nova/OpenStackNovaProjectGroup.php
diff --git a/OpenStackNovaPuppetGroup.php b/nova/OpenStackNovaPuppetGroup.php
similarity index 100%
rename from OpenStackNovaPuppetGroup.php
rename to nova/OpenStackNovaPuppetGroup.php
diff --git a/OpenStackNovaRole.php b/nova/OpenStackNovaRole.php
similarity index 100%
rename from OpenStackNovaRole.php
rename to nova/OpenStackNovaRole.php
diff --git a/OpenStackNovaSecurityGroup.php
b/nova/OpenStackNovaSecurityGroup.php
similarity index 100%
rename from OpenStackNovaSecurityGroup.php
rename to nova/OpenStackNovaSecurityGroup.php
diff --git a/OpenStackNovaSecurityGroupRule.php
b/nova/OpenStackNovaSecurityGroupRule.php
similarity index 100%
rename from OpenStackNovaSecurityGroupRule.php
rename to nova/OpenStackNovaSecurityGroupRule.php
diff --git a/OpenStackNovaSudoer.php b/nova/OpenStackNovaSudoer.php
similarity index 100%
rename from OpenStackNovaSudoer.php
rename to nova/OpenStackNovaSudoer.php
diff --git a/OpenStackNovaUser.php b/nova/OpenStackNovaUser.php
similarity index 100%
rename from OpenStackNovaUser.php
rename to nova/OpenStackNovaUser.php
diff --git a/OpenStackNovaVolume.php b/nova/OpenStackNovaVolume.php
similarity index 100%
rename from OpenStackNovaVolume.php
rename to nova/OpenStackNovaVolume.php
--
To view, visit https://gerrit.wikimedia.org/r/52350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28133fa6b42519335fe6cf54ae5f3ea96474b12b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
