Skip to content

Commit 3047929

Browse files
xueyuanxueyuan
committed
Merged
2 parents 1e539e8 + 3c59747 commit 3047929

1,585 files changed

Lines changed: 61541 additions & 23087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
build/replace.properties
1919
build/build.number
2020
bin/
21-
cloudstack-proprietary/
22-
premium/
2321
.lock-wscript
24-
artifacts/
2522
.waf-*
2623
waf-*
2724
target/
@@ -37,7 +34,7 @@ cloud-*.tar.bz2
3734
*.egg-info/
3835
*.prefs
3936
build.number
40-
api.log.*.gz
37+
*.log.*.gz
4138
cloud.log.*.*
4239
unittest
4340
deps/cloud.userlibraries
@@ -59,6 +56,7 @@ tools/cli/build/
5956
*.iso
6057
*.tar.gz
6158
*.tgz
59+
.*
6260
target-eclipse
6361
awsapi/modules/*
6462
!.gitignore

‎CHANGES‎

Lines changed: 382 additions & 3 deletions
Large diffs are not rendered by default.

‎DISCLAIMER‎

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

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Apache CloudStack (Incubating) Version 4.0.0
1+
Apache CloudStack Version 4.2.0
22

3-
# About Apache CloudStack (Incubating)
3+
# About Apache CloudStack
44

5-
Apache CloudStack (Incubating) is software designed to deploy
5+
Apache CloudStack is software designed to deploy
66
and manage large networks of virtual machines, as a highly
77
available, highly scalable Infrastructure as a Service (IaaS)
88
cloud computing platform. CloudStack is used by a number of

‎agent/conf/agent.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ domr.scripts.dir=scripts/network/domr/kvm
7878
# a sensible default will be selected based on the network.bridge.type but can
7979
# be overridden here.
8080
# native = com.cloud.hypervisor.kvm.resource.BridgeVifDriver
81-
# openvswitch = com.cloud.hypervisor.kvm.resource.OvsBridgeDriver
81+
# openvswitch = com.cloud.hypervisor.kvm.resource.OvsVifDriver
8282
#libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
8383

8484
# set the hypervisor type, values are: kvm, lxc

‎agent/src/com/cloud/agent/AgentShell.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@
3838

3939
import javax.naming.ConfigurationException;
4040

41-
import org.apache.commons.beanutils.PropertyUtils;
4241
import org.apache.commons.httpclient.HttpClient;
4342
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
4443
import org.apache.commons.httpclient.methods.GetMethod;
4544
import org.apache.log4j.Logger;
46-
import org.apache.log4j.PropertyConfigurator;
4745
import org.apache.log4j.xml.DOMConfigurator;
4846

4947
import com.cloud.agent.Agent.ExitStatus;
@@ -373,6 +371,7 @@ protected boolean parseCommand(final String[] args)
373371
throw new ConfigurationException("Unable to find the guid");
374372
}
375373
_guid = UUID.randomUUID().toString();
374+
_properties.setProperty("guid", _guid);
376375
}
377376

378377
return true;

‎agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,14 @@ public boolean configure(String name, Map<String, Object> params)
235235
if (_eth1ip != null) {
236236
params.put("private.network.device", "eth1");
237237
} else {
238-
s_logger.warn("WARNING: eth1ip parameter is not found!");
238+
s_logger.info("eth1ip parameter has not been configured, assuming that we are not inside a system vm");
239239
}
240240

241241
String eth2ip = (String) params.get("eth2ip");
242242
if (eth2ip != null) {
243243
params.put("public.network.device", "eth2");
244244
} else {
245-
s_logger.warn("WARNING: eth2ip parameter is not found!");
245+
s_logger.info("eth2ip parameter is not found, assuming that we are not inside a system vm");
246246
}
247247

248248
super.configure(name, params);

server/src/com/cloud/maint/UpgradeMonitor.java renamed to api/src/com/cloud/agent/api/storage/CreateVolumeOVAAnswer.java

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
1-
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
3-
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
5-
// to you under the Apache License, Version 2.0 (the
6-
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing,
12-
// software distributed under the License is distributed on an
13-
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
15-
// specific language governing permissions and limitations
16-
// under the License.
17-
package com.cloud.maint;
18-
19-
/**
20-
* has been released.
21-
*
22-
*/
23-
public class UpgradeMonitor implements Runnable {
24-
private String _url;
25-
private long _period;
26-
27-
public UpgradeMonitor(String url, long period) {
28-
_url = url;
29-
}
30-
31-
public void run() {
32-
33-
}
34-
}
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api.storage;
18+
19+
import com.cloud.agent.api.Answer;
20+
21+
public class CreateVolumeOVAAnswer extends Answer {
22+
public CreateVolumeOVAAnswer(CreateVolumeOVACommand cmd, boolean result, String details) {
23+
super(cmd, result, details);
24+
}
25+
26+
}

‎api/src/com/cloud/agent/api/storage/CreateVolumeOVACommand.java‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api.storage;
18+
19+
import com.cloud.agent.api.Command;
20+
import com.cloud.agent.api.to.StorageFilerTO;
21+
import com.cloud.storage.StoragePool;
22+
23+
public class CreateVolumeOVACommand extends Command {
24+
String secUrl;
25+
String volPath;
26+
String volName;
27+
StorageFilerTO pool;
28+
29+
public CreateVolumeOVACommand() {
30+
}
31+
32+
public CreateVolumeOVACommand(String secUrl, String volPath, String volName, StoragePool pool, int wait) {
33+
this.secUrl = secUrl;
34+
this.volPath = volPath;
35+
this.volName = volName;
36+
this.pool = new StorageFilerTO(pool);
37+
setWait(wait);
38+
}
39+
40+
@Override
41+
public boolean executeInSequence() {
42+
return true;
43+
}
44+
45+
public String getVolPath() {
46+
return this.volPath;
47+
}
48+
49+
public String getVolName() {
50+
return this.volName;
51+
}
52+
public String getSecondaryStorageUrl() {
53+
return this.secUrl;
54+
}
55+
public StorageFilerTO getPool() {
56+
return pool;
57+
}
58+
}
59+
60+

core/src/com/cloud/vm/VirtualDisk.java renamed to api/src/com/cloud/agent/api/storage/PrepareOVAPackingAnswer.java

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
1-
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
3-
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
5-
// to you under the Apache License, Version 2.0 (the
6-
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
8-
//
9-
// http://www.apache.org/licenses/LICENSE-2.0
10-
//
11-
// Unless required by applicable law or agreed to in writing,
12-
// software distributed under the License is distributed on an
13-
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
15-
// specific language governing permissions and limitations
16-
// under the License.
17-
package com.cloud.vm;
18-
19-
import com.cloud.storage.Storage;
20-
21-
/**
22-
* VirtualDisk describes the disks that are plugged into
23-
* the virtual machine.
24-
*
25-
*/
26-
public class VirtualDisk {
27-
public Storage.ImageFormat format;
28-
public String url;
29-
public boolean bootable;
30-
public long size;
31-
}
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.agent.api.storage;
18+
19+
import com.cloud.agent.api.Answer;
20+
21+
public class PrepareOVAPackingAnswer extends Answer {
22+
public PrepareOVAPackingAnswer(PrepareOVAPackingCommand cmd, boolean result, String details) {
23+
super(cmd, result, details);
24+
}
25+
26+
}

0 commit comments

Comments
 (0)