Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c11dbad

Browse filesBrowse files
nitinmehnitinmeh
committed
merge master
1 parent 836a3f1 commit c11dbad
Copy full SHA for c11dbad

File tree

Expand file treeCollapse file tree

1,283 files changed

+28126
-12895
lines changed
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

1,283 files changed

+28126
-12895
lines changed
Open diff view settings
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+2-4Lines 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
Collapse file

‎agent/conf/agent.properties‎

Copy file name to clipboardExpand all lines: agent/conf/agent.properties
+1-1Lines 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
Collapse file

‎core/src/com/cloud/vm/VirtualDisk.java‎ ‎…t/api/storage/CreateVolumeOVAAnswer.java‎core/src/com/cloud/vm/VirtualDisk.java renamed to api/src/com/cloud/agent/api/storage/CreateVolumeOVAAnswer.java core/src/com/cloud/vm/VirtualDisk.java renamed to api/src/com/cloud/agent/api/storage/CreateVolumeOVAAnswer.java

Copy file name to clipboard
+26-31Lines 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 CreateVolumeOVAAnswer extends Answer {
22+
public CreateVolumeOVAAnswer(CreateVolumeOVACommand cmd, boolean result, String details) {
23+
super(cmd, result, details);
24+
}
25+
26+
}
Collapse file

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

Copy file name to clipboard
+60Lines 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+
Collapse file

‎…com/cloud/maint/UpgradeManagerMBean.java‎ ‎…api/storage/PrepareOVAPackingAnswer.java‎server/src/com/cloud/maint/UpgradeManagerMBean.java renamed to api/src/com/cloud/agent/api/storage/PrepareOVAPackingAnswer.java server/src/com/cloud/maint/UpgradeManagerMBean.java renamed to api/src/com/cloud/agent/api/storage/PrepareOVAPackingAnswer.java

Copy file name to clipboard
+26-23Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +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-
import com.cloud.utils.mgmt.ManagementBean;
20-
21-
public interface UpgradeManagerMBean extends ManagementBean {
22-
public String deployNewAgent(String location);
23-
}
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+
}
Collapse file

‎…d/storage/snapshot/SnapshotSchedule.java‎ ‎…pi/storage/PrepareOVAPackingCommand.java‎core/src/com/cloud/storage/snapshot/SnapshotSchedule.java renamed to api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java core/src/com/cloud/storage/snapshot/SnapshotSchedule.java renamed to api/src/com/cloud/agent/api/storage/PrepareOVAPackingCommand.java

Copy file name to clipboard
+48-46Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,48 @@
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.storage.snapshot;
18-
19-
import org.apache.cloudstack.api.Identity;
20-
import org.apache.cloudstack.api.InternalIdentity;
21-
22-
import java.util.Date;
23-
24-
public interface SnapshotSchedule extends InternalIdentity, Identity {
25-
26-
Long getVolumeId();
27-
28-
Long getPolicyId();
29-
30-
void setPolicyId(long policyId);
31-
32-
/**
33-
* @return the scheduledTimestamp
34-
*/
35-
Date getScheduledTimestamp();
36-
37-
void setScheduledTimestamp(Date scheduledTimestamp);
38-
39-
Long getAsyncJobId();
40-
41-
void setAsyncJobId(Long asyncJobId);
42-
43-
Long getSnapshotId();
44-
45-
void setSnapshotId(Long snapshotId);
46-
}
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+
21+
public class PrepareOVAPackingCommand extends Command {
22+
private String templatePath;
23+
private String secUrl;
24+
25+
public PrepareOVAPackingCommand() {
26+
}
27+
28+
public PrepareOVAPackingCommand(String secUrl, String templatePath) {
29+
this.secUrl = secUrl;
30+
this.templatePath = templatePath;
31+
}
32+
33+
@Override
34+
public boolean executeInSequence() {
35+
return true;
36+
}
37+
38+
public String getTemplatePath() {
39+
return this.templatePath;
40+
}
41+
42+
public String getSecondaryStorageUrl() {
43+
return this.secUrl;
44+
}
45+
46+
}
47+
48+
Collapse file

‎…re/src/com/cloud/alert/AlertAdapter.java‎ ‎api/src/com/cloud/alert/AlertAdapter.java‎core/src/com/cloud/alert/AlertAdapter.java renamed to api/src/com/cloud/alert/AlertAdapter.java core/src/com/cloud/alert/AlertAdapter.java renamed to api/src/com/cloud/alert/AlertAdapter.java

Copy file name to clipboard
File renamed without changes.
Collapse file

‎api/src/com/cloud/async/AsyncJob.java‎

Copy file name to clipboardExpand all lines: api/src/com/cloud/async/AsyncJob.java
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ public enum Type {
5050
AutoScaleVmProfile,
5151
AutoScaleVmGroup,
5252
GlobalLoadBalancerRule,
53-
AffinityGroup
53+
LoadBalancerRule,
54+
AffinityGroup,
55+
InternalLbVm,
56+
DedicatedGuestVlanRange
5457
}
5558

5659
long getUserId();
Collapse file

‎api/src/com/cloud/configuration/ConfigurationService.java‎

Copy file name to clipboardExpand all lines: api/src/com/cloud/configuration/ConfigurationService.java
+8-7Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020

2121
import javax.naming.NamingException;
2222

23+
import com.cloud.exception.InvalidParameterValueException;
24+
import com.cloud.exception.InsufficientCapacityException;
25+
import com.cloud.exception.ConcurrentOperationException;
26+
import com.cloud.exception.ResourceUnavailableException;
27+
import com.cloud.exception.ResourceAllocationException;
2328
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
2429
import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
2530
import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
@@ -46,10 +51,6 @@
4651
import com.cloud.dc.DataCenter;
4752
import com.cloud.dc.Pod;
4853
import com.cloud.dc.Vlan;
49-
import com.cloud.exception.ConcurrentOperationException;
50-
import com.cloud.exception.InsufficientCapacityException;
51-
import com.cloud.exception.ResourceAllocationException;
52-
import com.cloud.exception.ResourceUnavailableException;
5354
import com.cloud.network.Networks.TrafficType;
5455
import com.cloud.offering.DiskOffering;
5556
import com.cloud.offering.NetworkOffering;
@@ -65,7 +66,7 @@ public interface ConfigurationService {
6566
* - the command wrapping name and value parameters
6667
* @return updated configuration object if successful
6768
*/
68-
Configuration updateConfiguration(UpdateCfgCmd cmd);
69+
Configuration updateConfiguration(UpdateCfgCmd cmd) throws InvalidParameterValueException;
6970

7071
/**
7172
* Create a service offering through the API
@@ -250,7 +251,7 @@ public interface ConfigurationService {
250251

251252
NetworkOffering getNetworkOffering(long id);
252253

253-
Integer getNetworkOfferingNetworkRate(long networkOfferingId);
254+
Integer getNetworkOfferingNetworkRate(long networkOfferingId, Long dataCenterId);
254255

255256
Account getVlanAccount(long vlanId);
256257

@@ -262,7 +263,7 @@ public interface ConfigurationService {
262263

263264
Long getDefaultPageSize();
264265

265-
Integer getServiceOfferingNetworkRate(long serviceOfferingId);
266+
Integer getServiceOfferingNetworkRate(long serviceOfferingId, Long dataCenterId);
266267

267268
DiskOffering getDiskOffering(long diskOfferingId);
268269

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.