Skip to content

Commit 7b011e7

Browse files
bfederlebfederle
committed
Merge branch 'master' into ui-vm-affinity
Conflicts: client/WEB-INF/classes/resources/messages.properties ui/scripts/cloudStack.js ui/scripts/instanceWizard.js
2 parents e5cea02 + df039aa commit 7b011e7

272 files changed

Lines changed: 16202 additions & 7933 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.

‎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

‎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+
}

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
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 com.cloud.agent.api.to.VirtualMachineTO;
20+
21+
public class MigrateWithStorageCompleteCommand extends Command {
22+
VirtualMachineTO vm;
23+
24+
public MigrateWithStorageCompleteCommand(VirtualMachineTO vm) {
25+
this.vm = vm;
26+
}
27+
28+
public VirtualMachineTO getVirtualMachine() {
29+
return vm;
30+
}
31+
32+
@Override
33+
public boolean executeInSequence() {
34+
return false;
35+
}
36+
}

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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.VolumeTO;
21+
import com.cloud.agent.api.to.NicTO;
22+
23+
public class MigrateWithStorageReceiveAnswer extends Answer {
24+
25+
Map<VolumeTO, Object> volumeToSr;
26+
Map<NicTO, Object> nicToNetwork;
27+
Map<String, String> token;
28+
29+
public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Exception ex) {
30+
super(cmd, ex);
31+
volumeToSr = null;
32+
nicToNetwork = null;
33+
token = null;
34+
}
35+
36+
public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map<VolumeTO, Object> volumeToSr,
37+
Map<NicTO, Object> nicToNetwork, Map<String, String> token) {
38+
super(cmd, true, null);
39+
this.volumeToSr = volumeToSr;
40+
this.nicToNetwork = nicToNetwork;
41+
this.token = token;
42+
}
43+
44+
public Map<VolumeTO, Object> getVolumeToSr() {
45+
return volumeToSr;
46+
}
47+
48+
public Map<NicTO, Object> getNicToNetwork() {
49+
return nicToNetwork;
50+
}
51+
52+
public Map<String, String> getToken() {
53+
return token;
54+
}
55+
}

‎api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.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 MigrateWithStorageReceiveCommand extends Command {
25+
VirtualMachineTO vm;
26+
Map<VolumeTO, StorageFilerTO> volumeToFiler;
27+
28+
public MigrateWithStorageReceiveCommand(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/MigrateWithStorageSendAnswer.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.Set;
20+
import com.cloud.agent.api.to.VolumeTO;
21+
22+
public class MigrateWithStorageSendAnswer extends Answer {
23+
24+
Set<VolumeTO> volumeToSet;
25+
26+
public MigrateWithStorageSendAnswer(MigrateWithStorageSendCommand cmd, Exception ex) {
27+
super(cmd, ex);
28+
volumeToSet = null;
29+
}
30+
31+
public MigrateWithStorageSendAnswer(MigrateWithStorageSendCommand cmd, Set<VolumeTO> volumeToSet) {
32+
super(cmd, true, null);
33+
this.volumeToSet = volumeToSet;
34+
}
35+
36+
public Set<VolumeTO> getVolumeToSet() {
37+
return volumeToSet;
38+
}
39+
}

0 commit comments

Comments
 (0)