Skip to content

Commit 18a3372

Browse files
bfederlebfederle
committed
Merge branch 'master' into ui-add-remove-nics
2 parents 564a850 + 5ce2890 commit 18a3372

805 files changed

Lines changed: 57456 additions & 25166 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.

‎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.

‎LICENSE‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -180,70 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation
180180

181181

182182
This distribution contains third party resources.
183-
Within the . directory
184-
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
185-
186-
Copyright (c) 2005-2010 Thomas Nagy
187-
188-
Redistribution and use in source and binary forms, with or without
189-
modification, are permitted provided that the following conditions
190-
are met:
191-
1. Redistributions of source code must retain the above copyright
192-
notice, this list of conditions and the following disclaimer.
193-
2. Redistributions in binary form must reproduce the above copyright
194-
notice, this list of conditions and the following disclaimer in the
195-
documentation and/or other materials provided with the distribution.
196-
3. Neither the name of the copyright holders nor the names of its
197-
contributors may be used to endorse or promote products derived from
198-
this software without specific prior written permission.
199-
200-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
201-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
202-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
203-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
204-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
205-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
206-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
207-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
208-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
209-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
210-
THE POSSIBILITY OF SUCH DAMAGE.
211-
212-
from Thomas Nagy http://code.google.com/p/waf/
213-
waf
214-
215-
Within the awsapi directory
216-
licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows)
217-
218-
Copyright (c) 2005-2010 Thomas Nagy
219-
220-
Redistribution and use in source and binary forms, with or without
221-
modification, are permitted provided that the following conditions
222-
are met:
223-
1. Redistributions of source code must retain the above copyright
224-
notice, this list of conditions and the following disclaimer.
225-
2. Redistributions in binary form must reproduce the above copyright
226-
notice, this list of conditions and the following disclaimer in the
227-
documentation and/or other materials provided with the distribution.
228-
3. Neither the name of the copyright holders nor the names of its
229-
contributors may be used to endorse or promote products derived from
230-
this software without specific prior written permission.
231-
232-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
233-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
234-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
235-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
236-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
237-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
238-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
239-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
240-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
241-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
242-
THE POSSIBILITY OF SUCH DAMAGE.
243-
244-
from Thomas Nagy http://code.google.com/p/waf/
245-
waf
246-
247183
Within the console-proxy/js directory
248184
licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows)
249185

‎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/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);

‎api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.cloud.agent.api.LogLevel.Log4jLevel;
2020
import com.cloud.agent.api.to.S3TO;
2121
import com.cloud.agent.api.to.SwiftTO;
22+
import com.cloud.storage.StoragePool;
2223

2324
/**
2425
* This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server
@@ -78,15 +79,16 @@ protected DeleteSnapshotBackupCommand() {
7879
* @param backupUUID The VHD which has to be deleted
7980
* @param childUUID The child VHD file of the backup whose parent is reset to its grandparent.
8081
*/
81-
public DeleteSnapshotBackupCommand(SwiftTO swift,
82+
public DeleteSnapshotBackupCommand(StoragePool pool,
83+
SwiftTO swift,
8284
S3TO s3,
8385
String secondaryStoragePoolURL,
8486
Long dcId,
8587
Long accountId,
8688
Long volumeId,
8789
String backupUUID, Boolean all)
8890
{
89-
super(null, secondaryStoragePoolURL, backupUUID, null, dcId, accountId, volumeId);
91+
super(pool, secondaryStoragePoolURL, backupUUID, null, dcId, accountId, volumeId);
9092
setSwift(swift);
9193
this.s3 = s3;
9294
setAll(all);

‎api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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;
18+
19+
import java.util.List;
20+
import com.cloud.agent.api.to.VolumeTO;
21+
22+
public class MigrateWithStorageAnswer extends Answer {
23+
24+
List<VolumeTO> volumeTos;
25+
26+
public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, Exception ex) {
27+
super(cmd, ex);
28+
volumeTos = null;
29+
}
30+
31+
public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, List<VolumeTO> volumeTos) {
32+
super(cmd, true, null);
33+
this.volumeTos = volumeTos;
34+
}
35+
36+
public List<VolumeTO> getVolumeTos() {
37+
return volumeTos;
38+
}
39+
}

‎api/src/com/cloud/agent/api/MigrateWithStorageCommand.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
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;
18+
19+
import java.util.Map;
20+
import com.cloud.agent.api.to.VirtualMachineTO;
21+
import com.cloud.agent.api.to.VolumeTO;
22+
import com.cloud.agent.api.to.StorageFilerTO;
23+
24+
public class MigrateWithStorageCommand extends Command {
25+
VirtualMachineTO vm;
26+
Map<VolumeTO, StorageFilerTO> volumeToFiler;
27+
28+
public MigrateWithStorageCommand(VirtualMachineTO vm, Map<VolumeTO, StorageFilerTO> volumeToFiler) {
29+
this.vm = vm;
30+
this.volumeToFiler = volumeToFiler;
31+
}
32+
33+
public VirtualMachineTO getVirtualMachine() {
34+
return vm;
35+
}
36+
37+
public Map<VolumeTO, StorageFilerTO> getVolumeToFiler() {
38+
return volumeToFiler;
39+
}
40+
41+
@Override
42+
public boolean executeInSequence() {
43+
return true;
44+
}
45+
}

‎api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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;
18+
19+
import java.util.List;
20+
import com.cloud.agent.api.to.VolumeTO;
21+
22+
public class MigrateWithStorageCompleteAnswer extends Answer {
23+
List<VolumeTO> volumeTos;
24+
25+
public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, Exception ex) {
26+
super(cmd, ex);
27+
volumeTos = null;
28+
}
29+
30+
public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, List<VolumeTO> volumeTos) {
31+
super(cmd, true, null);
32+
this.volumeTos = volumeTos;
33+
}
34+
35+
public List<VolumeTO> getVolumeTos() {
36+
return volumeTos;
37+
}
38+
}

0 commit comments

Comments
 (0)