Skip to content

Commit f843754

Browse files
author
Prachi Damle
committed
Merge branch 'master' into rbac
Conflicts: api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/api/query/QueryManagerImpl.java server/src/com/cloud/template/TemplateAdapterBase.java setup/db/db/schema-430to440.sql tools/apidoc/gen_toc.py
2 parents 72c0f1a + 7d0472b commit f843754

188 files changed

Lines changed: 5820 additions & 4945 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.

‎agent/conf/agent.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,7 @@ domr.scripts.dir=scripts/network/domr/kvm
114114
# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
115115
# on,run virsh capabilities for more details.
116116
# guest.cpu.model=
117+
#
118+
# vm.memballoon.disable=true
119+
# Disable memory ballooning on vm guests for overcommit, by default overcommit
120+
# feature enables balloon and sets currentMemory to a minimum value.

‎api/src/com/cloud/agent/api/to/IpAddressTO.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public class IpAddressTO {
3333
private Integer networkRate;
3434
private TrafficType trafficType;
3535
private String networkName;
36+
private Integer nicDevId;
37+
private boolean newNic;
3638

3739
public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String broadcastUri, String vlanGateway, String vlanNetmask,
3840
String vifMacAddress, Integer networkRate, boolean isOneToOneNat) {
@@ -116,4 +118,19 @@ public Integer getNetworkRate() {
116118
return networkRate;
117119
}
118120

121+
public Integer getNicDevId() {
122+
return nicDevId;
123+
}
124+
125+
public void setNicDevId(Integer nicDevId) {
126+
this.nicDevId = nicDevId;
127+
}
128+
129+
public boolean isNewNic() {
130+
return newNic;
131+
}
132+
133+
public void setNewNic(boolean newNic) {
134+
this.newNic = newNic;
135+
}
119136
}

‎api/src/com/cloud/network/Network.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ public static class Provider {
113113

114114
public static final Provider VirtualRouter = new Provider("VirtualRouter", false);
115115
public static final Provider JuniperContrailRouter = new Provider("JuniperContrailRouter", false);
116+
public static final Provider JuniperContrailVpcRouter = new Provider("JuniperContrailVpcRouter", false);
116117
public static final Provider JuniperSRX = new Provider("JuniperSRX", true);
117118
public static final Provider PaloAlto = new Provider("PaloAlto", true);
118119
public static final Provider F5BigIp = new Provider("F5BigIp", true);

‎api/src/com/cloud/network/NetworkService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> listNetworkService
110110

111111
long findPhysicalNetworkId(long zoneId, String tag, TrafficType trafficType);
112112

113-
PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType, String xenLabel, String kvmLabel, String vmwareLabel,
113+
PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType, String isolationMethod, String xenLabel, String kvmLabel, String vmwareLabel,
114114
String simulatorLabel, String vlan, String hypervLabel);
115115

116116
PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id);

‎api/src/com/cloud/network/Networks.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,22 @@ public String getValueFrom(URI uri) {
9494
return uri.getSchemeSpecificPart();
9595
}
9696
},
97-
Mido("mido", String.class), Pvlan("pvlan", String.class), Vxlan("vxlan", Long.class), UnDecided(null, null), OpenDaylight("opendaylight", String.class);
97+
Mido("mido", String.class), Pvlan("pvlan", String.class),
98+
Vxlan("vxlan", Long.class) {
99+
@Override
100+
public <T> URI toUri(T value) {
101+
try {
102+
if (value.toString().contains("://"))
103+
return new URI(value.toString());
104+
else
105+
return new URI("vxlan://" + value.toString());
106+
} catch (URISyntaxException e) {
107+
throw new CloudRuntimeException(
108+
"Unable to convert to broadcast URI: " + value);
109+
}
110+
}
111+
},
112+
UnDecided(null, null), OpenDaylight("opendaylight", String.class);
98113

99114
private final String scheme;
100115
private final Class<?> type;

‎api/src/com/cloud/network/rules/FirewallRule.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ enum State {
3636
Staged, // Rule been created but has never got through network rule conflict detection. Rules in this state can not be sent to network elements.
3737
Add, // Add means the rule has been created and has gone through network rule conflict detection.
3838
Active, // Rule has been sent to the network elements and reported to be active.
39-
Revoke // Revoke means this rule has been revoked. If this rule has been sent to the network elements, the rule will be deleted from database.
39+
Revoke, // Revoke means this rule has been revoked. If this rule has been sent to the network elements, the rule will be deleted from database.
40+
Deleting // rule has been revoked and is scheduled for deletion
4041
}
4142

4243
enum TrafficType {

‎api/src/com/cloud/network/vpc/StaticRoute.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ enum State {
2525
Staged, // route been created but has never got through network rule conflict detection. Routes in this state can not be sent to VPC virtual router.
2626
Add, // Add means the route has been created and has gone through network rule conflict detection.
2727
Active, // Route has been sent to the VPC router and reported to be active.
28-
Revoke // Revoke means this route has been revoked. If this route has been sent to the VPC router, the route will be deleted from database.
28+
Revoke, // Revoke means this route has been revoked. If this route has been sent to the VPC router, the route will be deleted from database.
29+
Deleting // rule has been revoked and is scheduled for deletion
2930
}
3031

3132
/**

‎api/src/com/cloud/server/ResourceTag.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ public enum ResourceObjectType {
5151
CustomerGateway(false, true),
5252
VpnConnection(false, true),
5353
User(true, true),
54-
DiskOffering(false, true);
54+
DiskOffering(false, true),
55+
AutoScaleVmProfile(false, true),
56+
AutoScaleVmGroup(false, true);
5557

5658
ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {
5759
this.resourceTagsSupport = resourceTagsSupport;

‎api/src/com/cloud/storage/Volume.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public String getDescription() {
8282
s_fsm.addTransition(Destroy, Event.ExpungingRequested, Expunging);
8383
s_fsm.addTransition(Expunging, Event.ExpungingRequested, Expunging);
8484
s_fsm.addTransition(Expunging, Event.OperationSucceeded, Expunged);
85-
s_fsm.addTransition(Expunging, Event.OperationFailed, Expunging);
85+
s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy);
8686
s_fsm.addTransition(Ready, Event.SnapshotRequested, Snapshotting);
8787
s_fsm.addTransition(Snapshotting, Event.OperationSucceeded, Ready);
8888
s_fsm.addTransition(Snapshotting, Event.OperationFailed, Ready);

‎api/src/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ public class ApiConstants {
344344
public static final String CAPACITY_IOPS = "capacityiops";
345345
public static final String NETWORK_SPEED = "networkspeed";
346346
public static final String BROADCAST_DOMAIN_RANGE = "broadcastdomainrange";
347+
public static final String ISOLATION_METHOD = "isolationmethod";
347348
public static final String ISOLATION_METHODS = "isolationmethods";
348349
public static final String PHYSICAL_NETWORK_ID = "physicalnetworkid";
349350
public static final String DEST_PHYSICAL_NETWORK_ID = "destinationphysicalnetworkid";

0 commit comments

Comments
 (0)