Author: dimach
Date: Wed Mar 4 20:51:17 2015
New Revision: 1664140
URL: http://svn.apache.org/r1664140
Log:
VCL-722: Database changes for OpenNebula module
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1664140&r1=1664139&r2=1664140&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Wed Mar 4 20:51:17 2015
@@ -1567,7 +1567,7 @@ INSERT IGNORE INTO `module` (`name`, `pr
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('os_win2012', 'Windows Server 2012 OS Module', '',
'VCL::Module::OS::Windows::Version_6::2012');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('predictive_level_2', 'Predictive Loading Module Level
2', 'Power off computer. If a virtual machine, it will be also destroyed.',
'VCL::Module::Predictive::Level_2');
INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_openstack', 'OpenStack Provisioning
Module', '', 'VCL::Module::Provisioning::openstack');
-
+INSERT IGNORE INTO `module` (`name`, `prettyname`, `description`,
`perlpackage`) VALUES ('provisioning_one', 'OpenNebula Provisioning Module',
'', 'VCL::Module::Provisioning::one');
-- --------------------------------------------------------
--
@@ -1639,6 +1639,7 @@ INSERT IGNORE INTO `provisioning` (`name
INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('libvirt','Libvirt Virtualization API', (SELECT `id` FROM `module` WHERE
`name` LIKE 'provisioning_libvirt'));
INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('none','None', (SELECT `id` FROM `module` WHERE `name` = 'base_module'));
INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('openstack', 'OpenStack Provisioning', (SELECT `id` FROM `module` WHERE `name`
LIKE 'provisioning_openstack'));
+INSERT IGNORE INTO `provisioning` (`name`, `prettyname`, `moduleid`) VALUES
('one', 'OpenNebula', (SELECT id FROM vcl.module where
name='provisioning_one'));
UPDATE IGNORE `provisioning` SET `name` = 'xcat', `prettyname` = 'xCAT' WHERE
`name` = 'xcat_13';
@@ -1656,6 +1657,7 @@ INSERT IGNORE provisioningOSinstalltype
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%lab%' AND OSinstalltype.name = 'none';
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%libvirt%' AND OSinstalltype.name = 'vmware';
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%openstack%' AND OSinstalltype.name = 'openstack';
+INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name='one' AND OSinstalltype.name = 'vmware';
DELETE FROM provisioningOSinstalltype WHERE
provisioningOSinstalltype.provisioningid IN (SELECT provisioning.id FROM
provisioning WHERE provisioning.name LIKE '%xcat_2%');
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1664140&r1=1664139&r2=1664140&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Wed Mar 4 20:51:17 2015
@@ -1709,7 +1709,8 @@ INSERT IGNORE INTO `module` (`id`, `name
(29, 'os_win8', 'Windows 8.x OS Module', '',
'VCL::Module::OS::Windows::Version_6::8'),
(30, 'os_win2012', 'Windows Server 2012 OS Module', '',
'VCL::Module::OS::Windows::Version_6::2012'),
(31, 'predictive_level_2', 'Predictive Loading Module Level 2', 'Power off
computer. If a virtual machine, it will be also destroyed.',
'VCL::Module::Predictive::Level_2'),
-(32, 'provisioning_openstack', 'OpenStack Provisioning Module', '',
'VCL::Module::Provisioning::openstack');
+(32, 'provisioning_openstack', 'OpenStack Provisioning Module', '',
'VCL::Module::Provisioning::openstack'),
+(33, 'provisioning_one', 'OpenNebula Provisioning Module', '',
'VCL::Module::Provisioning::one');
--
-- Dumping data for table `OStype`
@@ -1825,7 +1826,8 @@ INSERT IGNORE INTO `provisioning` (`id`,
(8, 'vbox', 'Virtual Box', 24),
(9, 'libvirt', 'Libvirt Virtualization API', 27),
(10, 'none', 'None', 23),
-(11, 'openstack', 'openstack', 32);
+(11, 'openstack', 'openstack', 32),
+(12, 'one', 'OpenNebula', 33);
--
-- Dumping data for table `provisioningOSinstalltype`
@@ -1839,6 +1841,8 @@ INSERT IGNORE provisioningOSinstalltype
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%lab%' AND OSinstalltype.name = 'none';
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%libvirt%' AND OSinstalltype.name = 'vmware';
INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name LIKE '%openstack%' AND OSinstalltype.name = 'openstack';
+INSERT IGNORE provisioningOSinstalltype (provisioningid, OSinstalltypeid)
SELECT provisioning.id, OSinstalltype.id FROM provisioning, OSinstalltype WHERE
provisioning.name='one' AND OSinstalltype.name = 'vmware';
+
--
-- Dumping data for table `resourcetype`
