Skip to content

Commit df58f51

Browse files
author
Girish Shilamkar
committed
Merge remote-tracking branch 'origin/master' into marvin
2 parents dedd41e + 1c4bbec commit df58f51

450 files changed

Lines changed: 12608 additions & 9774 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.

‎LICENSE.header‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Licensed to the Apache Software Foundation (ASF) under one
2-
or more contributor license agreements. See the NOTICE file
2+
or more contributor license agreements. See the NOTICE file
33
distributed with this work for additional information
4-
regarding copyright ownership. The ASF licenses this file
4+
regarding copyright ownership. The ASF licenses this file
55
to you under the Apache License, Version 2.0 (the
66
"License"); you may not use this file except in compliance
7-
with the License. You may obtain a copy of the License at
7+
with the License. You may obtain a copy of the License at
88

9-
http://www.apache.org/licenses/LICENSE-2.0
9+
http://www.apache.org/licenses/LICENSE-2.0
1010

1111
Unless required by applicable law or agreed to in writing,
1212
software distributed under the License is distributed on an
1313
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
KIND, either express or implied. See the License for the
14+
KIND, either express or implied. See the License for the
1515
specific language governing permissions and limitations
1616
under the License.

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

scripts/network/domr/s2s_vpn.sh renamed to api/resources/META-INF/cloudstack/api-config/module.properties

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/bin/bash
21
# Licensed to the Apache Software Foundation (ASF) under one
32
# or more contributor license agreements. See the NOTICE file
43
# distributed with this work for additional information
@@ -15,15 +14,5 @@
1514
# KIND, either express or implied. See the License for the
1615
# specific language governing permissions and limitations
1716
# under the License.
18-
19-
20-
21-
22-
# @VERSION@
23-
24-
cert="/root/.ssh/id_rsa.cloud"
25-
domr=$1
26-
shift
27-
ssh -p 3922 -o StrictHostKeyChecking=no -i $cert root@$domr "/opt/cloud/bin/ipsectunnel.sh $*" >/dev/null
28-
29-
exit $?
17+
name=api-config
18+
parent=core

‎api/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<beans xmlns="http://www.springframework.org/schema/beans"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xmlns:context="http://www.springframework.org/schema/context"
22+
xmlns:aop="http://www.springframework.org/schema/aop"
23+
xsi:schemaLocation="http://www.springframework.org/schema/beans
24+
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
25+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
26+
http://www.springframework.org/schema/context
27+
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
28+
>
29+
30+
<bean id="apiServiceConfiguration" class="org.apache.cloudstack.config.ApiServiceConfiguration" />
31+
32+
</beans>

‎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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static class Provider {
112112
private static List<Provider> supportedProviders = new ArrayList<Provider>();
113113

114114
public static final Provider VirtualRouter = new Provider("VirtualRouter", false);
115-
public static final Provider JuniperContrail = new Provider("JuniperContrail", false);
115+
public static final Provider JuniperContrailRouter = new Provider("JuniperContrailRouter", false);
116116
public static final Provider JuniperSRX = new Provider("JuniperSRX", true);
117117
public static final Provider PaloAlto = new Provider("PaloAlto", true);
118118
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/PhysicalNetwork.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public enum State {
3333
}
3434

3535
public enum IsolationMethod {
36-
VLAN, L3, GRE, STT, VNS, MIDO, SSP, VXLAN, ODL;
36+
VLAN, L3, GRE, STT, VNS, MIDO, SSP, VXLAN, ODL, L3VPN;
3737
}
3838

3939
public enum BroadcastDomainRange {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ public interface VirtualNetworkApplianceService {
6969

7070
List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
7171

72-
public static final String MinVRVersion = "4.2.0";
72+
public static final String MinVRVersion = "4.3.0";
7373
}

0 commit comments

Comments
 (0)