diff --git a/client/pom.xml b/client/pom.xml index be1fcbfb1a1..c3a048604b1 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -159,7 +159,7 @@ + todir="${basedir}/target/generated-webapp/WEB-INF/lib/scripts"> + diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index e2336946e27..d9243d553fb 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -160,6 +160,8 @@ stopRouter=com.cloud.api.commands.StopRouterCmd;7 destroyRouter=com.cloud.api.commands.DestroyRouterCmd;7 changeServiceForRouter=com.cloud.api.commands.UpgradeRouterCmd;7 listRouters=com.cloud.api.commands.ListRoutersCmd;7 +listVirtualRouterElements=com.cloud.api.commands.ListVirtualRouterElementsCmd;7 +configureVirtualRouterElement=com.cloud.api.commands.ConfigureVirtualRouterElementCmd;7 #### system vm commands startSystemVm=com.cloud.api.commands.StartSystemVMCmd;1 diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 5d350aeeb20..ef1667b2821 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -120,12 +120,6 @@ systemvm.zip - - ../patches/target/ - - cloud-scripts.tar.gz - - ../patches/systemvm/debian/config/root/.ssh @@ -137,6 +131,50 @@ + + maven-antrun-plugin + 1.7 + + + generate-resource + generate-resources + + run + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + mkisofs + dist + + -quiet + -r + -o + systemvm.iso + systemvm.zip + cloud-scripts.tgz + authorized_keys + + + @@ -162,11 +200,6 @@ systemvm - - - systemvm - - @@ -190,7 +223,7 @@ -o systemvm.iso systemvm.zip - cloud-scripts.tar.gz + cloud-scripts.tgz authorized_keys diff --git a/console-proxy/systemvm-descriptor.xml b/console-proxy/systemvm-descriptor.xml index 44ce2ebe782..7efe7fdfcb0 100644 --- a/console-proxy/systemvm-descriptor.xml +++ b/console-proxy/systemvm-descriptor.xml @@ -56,6 +56,7 @@ log4j-cloud.xml consoleproxy.properties + agent.properties diff --git a/pom.xml b/pom.xml index 8c72dc69ca9..d620b681020 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,7 @@ client test tools/devcloud + tools/apidoc diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 9d6e5b6d1ad..8ce6b8ad8ee 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -69,7 +69,6 @@ import com.cloud.utils.ssh.SSHCmdHelper; public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class); - private String _setupAgentPath; private ConfigurationDao _configDao; private String _hostIp; private int _waitTime = 5; /*wait for 5 minutes*/ @@ -288,7 +287,6 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, public boolean configure(String name, Map params) throws ConfigurationException { ComponentLocator locator = ComponentLocator.getCurrentLocator(); _configDao = locator.getDao(ConfigurationDao.class); - _setupAgentPath = Script.findScript(getPatchPath(), "setup_agent.sh"); _kvmPrivateNic = _configDao.getValue(Config.KvmPrivateNetwork.key()); if (_kvmPrivateNic == null) { _kvmPrivateNic = "cloudbr0"; @@ -304,9 +302,6 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, _kvmGuestNic = _kvmPrivateNic; } - if (_setupAgentPath == null) { - throw new ConfigurationException("Can't find setup_agent.sh"); - } _hostIp = _configDao.getValue("host"); if (_hostIp == null) { throw new ConfigurationException("Can't get host IP"); diff --git a/setup/apidoc/XmlToHtmlConverter.java b/tools/apidoc/XmlToHtmlConverter.java similarity index 100% rename from setup/apidoc/XmlToHtmlConverter.java rename to tools/apidoc/XmlToHtmlConverter.java diff --git a/setup/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh old mode 100644 new mode 100755 similarity index 100% rename from setup/apidoc/build-apidoc.sh rename to tools/apidoc/build-apidoc.sh diff --git a/setup/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py similarity index 100% rename from setup/apidoc/gen_toc.py rename to tools/apidoc/gen_toc.py diff --git a/setup/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl similarity index 100% rename from setup/apidoc/generateadmincommands.xsl rename to tools/apidoc/generateadmincommands.xsl diff --git a/setup/apidoc/generatecommand.xsl b/tools/apidoc/generatecommand.xsl similarity index 100% rename from setup/apidoc/generatecommand.xsl rename to tools/apidoc/generatecommand.xsl diff --git a/setup/apidoc/generatecustomcommand.xsl b/tools/apidoc/generatecustomcommand.xsl similarity index 100% rename from setup/apidoc/generatecustomcommand.xsl rename to tools/apidoc/generatecustomcommand.xsl diff --git a/setup/apidoc/generatedomainadmincommands.xsl b/tools/apidoc/generatedomainadmincommands.xsl similarity index 100% rename from setup/apidoc/generatedomainadmincommands.xsl rename to tools/apidoc/generatedomainadmincommands.xsl diff --git a/setup/apidoc/generategenericcommand.xsl b/tools/apidoc/generategenericcommand.xsl similarity index 100% rename from setup/apidoc/generategenericcommand.xsl rename to tools/apidoc/generategenericcommand.xsl diff --git a/setup/apidoc/generatetoc.xsl b/tools/apidoc/generatetoc.xsl similarity index 100% rename from setup/apidoc/generatetoc.xsl rename to tools/apidoc/generatetoc.xsl diff --git a/setup/apidoc/generatetoc_footer.xsl b/tools/apidoc/generatetoc_footer.xsl similarity index 100% rename from setup/apidoc/generatetoc_footer.xsl rename to tools/apidoc/generatetoc_footer.xsl diff --git a/setup/apidoc/generatetoc_header.xsl b/tools/apidoc/generatetoc_header.xsl similarity index 100% rename from setup/apidoc/generatetoc_header.xsl rename to tools/apidoc/generatetoc_header.xsl diff --git a/setup/apidoc/generateusercommands.xsl b/tools/apidoc/generateusercommands.xsl similarity index 100% rename from setup/apidoc/generateusercommands.xsl rename to tools/apidoc/generateusercommands.xsl diff --git a/setup/apidoc/images/api_bullets.gif b/tools/apidoc/images/api_bullets.gif similarity index 100% rename from setup/apidoc/images/api_bullets.gif rename to tools/apidoc/images/api_bullets.gif diff --git a/setup/apidoc/images/back_button.gif b/tools/apidoc/images/back_button.gif similarity index 100% rename from setup/apidoc/images/back_button.gif rename to tools/apidoc/images/back_button.gif diff --git a/setup/apidoc/images/back_button_hover.gif b/tools/apidoc/images/back_button_hover.gif similarity index 100% rename from setup/apidoc/images/back_button_hover.gif rename to tools/apidoc/images/back_button_hover.gif diff --git a/setup/apidoc/images/cloudstack.png b/tools/apidoc/images/cloudstack.png similarity index 100% rename from setup/apidoc/images/cloudstack.png rename to tools/apidoc/images/cloudstack.png diff --git a/setup/apidoc/images/ins_buttonshadow.gif b/tools/apidoc/images/ins_buttonshadow.gif similarity index 100% rename from setup/apidoc/images/ins_buttonshadow.gif rename to tools/apidoc/images/ins_buttonshadow.gif diff --git a/setup/apidoc/images/insdownload_button.gif b/tools/apidoc/images/insdownload_button.gif similarity index 100% rename from setup/apidoc/images/insdownload_button.gif rename to tools/apidoc/images/insdownload_button.gif diff --git a/setup/apidoc/images/insdownload_button_hover.gif b/tools/apidoc/images/insdownload_button_hover.gif similarity index 100% rename from setup/apidoc/images/insdownload_button_hover.gif rename to tools/apidoc/images/insdownload_button_hover.gif diff --git a/setup/apidoc/images/insjoincomm_button.gif b/tools/apidoc/images/insjoincomm_button.gif similarity index 100% rename from setup/apidoc/images/insjoincomm_button.gif rename to tools/apidoc/images/insjoincomm_button.gif diff --git a/setup/apidoc/images/insjoincomm_button_hover.gif b/tools/apidoc/images/insjoincomm_button_hover.gif similarity index 100% rename from setup/apidoc/images/insjoincomm_button_hover.gif rename to tools/apidoc/images/insjoincomm_button_hover.gif diff --git a/setup/apidoc/includes/main.css b/tools/apidoc/includes/main.css similarity index 100% rename from setup/apidoc/includes/main.css rename to tools/apidoc/includes/main.css diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml new file mode 100644 index 00000000000..0511d2fe603 --- /dev/null +++ b/tools/apidoc/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + cloud-apidoc + Apache CloudStack apidoc Tools + pom + + org.apache.cloudstack + cloudstack + 4.1.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-client-ui + ${project.version} + war + + + + ../../client/target/cloud-client-ui-4.1.0-SNAPSHOT/WEB-INF/ + ${client.config.base}/lib + ${client.config.base}/classes + + + + install + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + bash + + -x + ./build-apidoc.sh + ${client.config.jars} + ${client.config.jars} + ./target + -f + ${client.config.conf}/commands.properties, ${client.config.conf}/commands-ext.properties,${client.config.conf}/virtualrouter_commands.properties, ${client.config.conf}/nicira-nvp_commands.properties + + + + + + diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg index 10fca376442..1a4b00cf23f 100644 --- a/tools/devcloud/devcloud.cfg +++ b/tools/devcloud/devcloud.cfg @@ -33,15 +33,15 @@ "networktype": "Basic", "pods": [ { - "endip": "10.0.2.220", + "endip": "192.168.56.220", "name": "test00", - "startip": "10.0.2.200", + "startip": "192.168.56.200", "guestIpRanges": [ { - "startip": "10.0.2.100", - "endip": "10.0.2.199", + "startip": "192.168.56.100", + "endip": "192.168.56.199", "netmask": "255.255.255.0", - "gateway": "10.0.2.2" + "gateway": "192.168.56.1" } ], "netmask": "255.255.255.0", @@ -52,21 +52,20 @@ "hosts": [ { "username": "root", - "url": "http://10.0.2.15/", + "url": "http://192.168.56.2/", "password": "password" } ], "clustertype": "CloudManaged" } ], - "gateway": "10.0.2.2" + "gateway": "192.168.56.1" } ], - "internaldns1": "10.0.2.3", - "internaldns2": "10.0.2.3", + "internaldns1": "192.168.56.1", "secondaryStorages": [ { - "url": "nfs://10.0.2.15:/opt/storage/secondary" + "url": "nfs://192.168.56.2:/opt/storage/secondary" } ] } @@ -105,6 +104,10 @@ { "name":"enable.s3.api", "value":"true" + }, + { + "name":"host", + "value":"192.168.56.1" } ], "mgtSvr": [ @@ -112,5 +115,13 @@ "mgtSvrIp": "127.0.0.1", "port": 8096 } - ] + ], + "dbSvr": + { + "dbSvr": "127.0.0.1", + "port": 3306, + "user": "cloud", + "passwd": "cloud", + "db": "cloud" + } } diff --git a/setup/db/clouddev.sql b/tools/devcloud/devcloud.sql similarity index 63% rename from setup/db/clouddev.sql rename to tools/devcloud/devcloud.sql index 10ad3b2513e..bd10c13886c 100644 --- a/setup/db/clouddev.sql +++ b/tools/devcloud/devcloud.sql @@ -16,17 +16,17 @@ -- under the License. -UPDATE `cloud`.`configuration` SET value = 'true' where name = 'use.local.storage'; -UPDATE `cloud`.`configuration` SET value = 'true' where name = 'system.vm.use.local.storage'; -INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created, use_local_storage, type) VALUES (17, 'tinyOffering', UUID(), 'tinyOffering', NOW(), 1, 'Service'); +INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created, use_local_storage, type, disk_size) VALUES (17, 'tinyOffering', UUID(), 'tinyOffering', NOW(), 1, 'Service', 0); INSERT INTO `cloud`.`service_offering` (id, cpu, speed, ram_size) VALUES (17, 1, 100, 100); INSERT INTO `cloud`.`disk_offering` (id, name, uuid, display_text, created, type, disk_size) VALUES (18, 'tinyDiskOffering', UUID(), 'tinyDiskOffering', NOW(), 'Disk', 1073741824); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('router.ram.size', '100'); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('router.cpu.mhz','100'); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('console.ram.size','100'); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('console.cpu.mhz', '100'); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('ssvm.ram.size','100'); -INSERT INTO `cloud`.`configuration` (name,value) VALUE('ssvm.cpu.mhz','100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','router.ram.size', '100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','router.cpu.mhz','100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','console.ram.size','100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','console.cpu.mhz', '100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','ssvm.ram.size','100'); +INSERT INTO `cloud`.`configuration` (instance, name,value) VALUE('DEFAULT','ssvm.cpu.mhz','100'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'system.vm.use.local.storage', 'true'); +INSERT INTO `cloud`.`configuration` (instance, name, value) VALUE('DEFAULT', 'integration.api.port', '8096'); UPDATE `cloud`.`configuration` SET value='10' where name = 'storage.overprovisioning.factor'; UPDATE `cloud`.`configuration` SET value='10' where name = 'cpu.overprovisioning.factor'; UPDATE `cloud`.`configuration` SET value='10' where name = 'mem.overprovisioning.factor'; diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml index 5f37d65389b..5c532c90a1b 100644 --- a/tools/devcloud/pom.xml +++ b/tools/devcloud/pom.xml @@ -20,54 +20,119 @@ 4.1.0-SNAPSHOT ../../pom.xml + + + mysql + mysql-connector-java + 5.1.21 + runtime + + + install - clean + deploydb - clean + deploydb - - - org.apache.maven.plugins - maven-antrun-plugin + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 - integration-test + initialize - run + read-project-properties - - - + + ${project.parent.basedir}/utils/conf/db.properties + ${project.parent.basedir}/utils/conf/db.properties.override + + true + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + - ant - ant-jsch - 1.6.5 - - - jsch - jsch - 0.1.29 + mysql + mysql-connector-java + ${cs.mysql.version} + + org.gjt.mm.mysql.Driver + jdbc:mysql://${db.cloud.host}:${db.cloud.port}/cloud + ${db.cloud.username} + ${db.cloud.password} + + ${maven.test.skip} + true + + + + create-schema + process-test-resources + + execute + + + + ${basedir}/devcloud.sql + + + + + + deploysvr + + + deploysvr + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + python + + ../marvin/marvin/deployDataCenter.py + -i + devcloud.cfg + + + + + +