Skip to content

Commit 7a0a923

Browse files
sudisonsudison
committed
Move KVM related code into plugins/hypervisor/kvm, a new jar file is
created: cloud-kvm.jar
1 parent 1fbf595 commit 7a0a923

39 files changed

Lines changed: 268 additions & 571 deletions

‎agent/conf/agent.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Sample configuration file for CloudStack agent
1919

2020
#resource= the java class, which agent load to execute
21-
resource=com.cloud.agent.resource.computing.LibvirtComputingResource
21+
resource=com.cloud.hypervisor.kvm.resource.LibvirtComputingResource
2222

2323
#workers= number of threads running in agent
2424
workers=5

‎agent/scripts/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
# under the License.
1818

1919
#run.sh runs the agent client.
20-
java $1 -Xms128M -Xmx384M -cp cglib-nodep-2.2.jar:trilead-ssh2-build213.jar:cloud-api.jar:cloud-core-extras.jar:cloud-utils.jar:cloud-agent.jar:cloud-console-proxy.jar:cloud-console-common.jar:freemarker.jar:log4j-1.2.15.jar:ws-commons-util-1.0.2.jar:xmlrpc-client-3.1.3.jar:cloud-core.jar:xmlrpc-common-3.1.3.jar:javaee-api-5.0-1.jar:gson-1.3.jar:commons-httpclient-3.1.jar:commons-logging-1.1.1.jar:commons-codec-1.4.jar:commons-collections-3.2.1.jar:commons-pool-1.4.jar:apache-log4j-extras-1.0.jar:libvirt-0.4.5.jar:jna.jar:.:/etc/cloud:./conf com.cloud.agent.AgentShell
20+
java $1 -Xms128M -Xmx384M -cp cglib-nodep-2.2.jar:trilead-ssh2-build213.jar:cloud-api.jar:cloud-core-extras.jar:cloud-utils.jar:cloud-agent.jar:cloud-console-proxy.jar:cloud-console-common.jar:freemarker.jar:log4j-1.2.15.jar:ws-commons-util-1.0.2.jar:xmlrpc-client-3.1.3.jar:cloud-core.jar:xmlrpc-common-3.1.3.jar:javaee-api-5.0-1.jar:gson-1.3.jar:commons-httpclient-3.1.jar:commons-logging-1.1.1.jar:commons-codec-1.4.jar:commons-collections-3.2.1.jar:commons-pool-1.4.jar:apache-log4j-extras-1.0.jar:libvirt-0.4.5.jar:jna.jar:.:/etc/cloud:./*:/usr/share/java/*:./conf com.cloud.agent.AgentShell

‎build/build-cloud-plugins.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,14 @@
198198

199199
<!-- ===================== Hypervisors ========================= -->
200200

201-
<target name="compile-hypervisors" depends="compile-ovm, compile-xen, compile-vmware" description="Compile all hypervisors"/>
202-
<target name="build-hypervisors" depends="build-ovm, build-xen, build-vmware" description="Builds all hypervisors"/>
201+
<target name="compile-hypervisors" depends="compile-kvm, compile-ovm, compile-xen, compile-vmware" description="Compile all hypervisors"/>
202+
<target name="build-hypervisors" depends="build-kvm, build-ovm, build-xen, build-vmware" description="Builds all hypervisors"/>
203203

204+
<target name="compile-kvm" depends="-init, compile-core, compile-agent" description="Compile KVM">
205+
<ant antfile="${base.dir}/plugins/hypervisors/kvm/build.xml" target="build"/>
206+
</target>
207+
<target name="build-kvm" depends="compile-kvm" />
208+
204209
<target name="compile-ovm" depends="-init, compile-server" description="Compile OVM">
205210
<ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="build"/>
206211
</target>

‎build/package.xml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<include name="cloud-commons-collections-3.2.1.jar" />
8383
<include name="cloud-commons-codec-1.4.jar" />
8484
<include name="cloud-commons-pool-1.4.jar" />
85-
<include name="libvirt-0.4.8.jar" />
8685
<include name="cloud-jna.jar" />
8786
<include name="cloud-cglib.jar" />
8887
<include name="jetty-6.1.26.jar" />
@@ -93,6 +92,7 @@
9392
<include name="${utils.jar}" />
9493
<include name="${core.jar}" />
9594
<include name="${api.jar}" />
95+
<include name="${kvm.jar}" />
9696
</zipfileset>
9797

9898
<zipfileset dir="${agent.dist.dir}" filemode="770">
@@ -112,7 +112,7 @@
112112
</target>
113113

114114

115-
<target name="package-agent" depends="-init-package, package-oss-systemvm, build-systemvm-patch, package-agent-common">
115+
<target name="package-agent" depends="-init-package, package-oss-systemvm, build-systemvm-patch, package-agent-common, build-kvm">
116116
<zip destfile="${dist.dir}/agent.zip" duplicate="preserve" update="true">
117117
<zipfileset dir="${dist.dir}" prefix="vms">
118118
<include name="patch.tgz" />
@@ -291,6 +291,17 @@
291291
</zip>
292292
</target>
293293

294+
<target name="package-kvm" depends="package-agent">
295+
<zip destfile="${dist.dir}/agent.zip" update="true">
296+
<zipfileset dir="${jar.dir}">
297+
<include name="cloud-kvm.jar"/>
298+
</zipfileset>
299+
<zipfileset dir="${deps.dir}">
300+
<include name="libvirt-0.4.8.jar"/>
301+
</zipfileset>
302+
</zip>
303+
</target>
304+
294305
<target name="clean-zip">
295306
<delete dir="${dist.dir}">
296307
<include name="*.zip" />

‎cloud.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ fi
532532
%files agent-libs
533533
%defattr(0644,root,root,0755)
534534
%{_javadir}/%{name}-agent.jar
535+
%{_javadir}/%{name}-kvm.jar
535536

536537
%files agent
537538
%defattr(0644,root,root,0755)

‎core/src/com/cloud/hypervisor/kvm/resource/KvmDummyResourceBase.java‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎debian/cloud-agent-libs.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/usr/share/java/cloud-agent.jar
2+
/usr/share/java/cloud-kvm.jar

‎plugins/hypervisors/kvm/.classpath‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5+
<classpathentry combineaccessrules="false" kind="src" path="/agent"/>
6+
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
7+
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
8+
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
10+
<classpathentry kind="output" path="bin"/>
11+
</classpath>

‎plugins/hypervisors/kvm/.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>KVM</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.python.pydev.PyDevBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.jdt.core.javabuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.python.pydev.pythonNature</nature>
22+
</natures>
23+
</projectDescription>

‎plugins/hypervisors/kvm/.pydevproject‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?eclipse-pydev version="1.0"?>
3+
4+
<pydev_project>
5+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
6+
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
7+
</pydev_project>

0 commit comments

Comments
 (0)