Skip to content

Commit a81f8b7

Browse files
bfederlebfederle
committed
Merge branch 'master' into ui-plugins
2 parents d1166e6 + 0055d80 commit a81f8b7

21 files changed

Lines changed: 287 additions & 101 deletions

File tree

‎awsapi/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
<artifactId>axis2-webapp</artifactId>
4848
<type>war</type>
4949
<version>${cs.axis2.version}</version>
50+
<exclusions>
51+
<exclusion>
52+
<groupId>xerces</groupId>
53+
<artifactId>xercesImpl</artifactId>
54+
</exclusion>
55+
</exclusions>
5056
</dependency>
5157
<dependency>
5258
<groupId>org.apache.ws.commons.axiom</groupId>
@@ -123,6 +129,10 @@
123129
<groupId>org.apache.xalan</groupId>
124130
<artifactId>xalan</artifactId>
125131
</exclusion>
132+
<exclusion>
133+
<groupId>org.opensaml</groupId>
134+
<artifactId>opensaml</artifactId>
135+
</exclusion>
126136
</exclusions>
127137
</dependency>
128138
<dependency>
@@ -139,6 +149,10 @@
139149
<groupId>org.apache.xalan</groupId>
140150
<artifactId>xalan</artifactId>
141151
</exclusion>
152+
<exclusion>
153+
<groupId>org.opensaml</groupId>
154+
<artifactId>opensaml</artifactId>
155+
</exclusion>
142156
</exclusions>
143157
</dependency>
144158
<dependency>
@@ -151,6 +165,10 @@
151165
<groupId>org.apache.xalan</groupId>
152166
<artifactId>xalan</artifactId>
153167
</exclusion>
168+
<exclusion>
169+
<groupId>org.opensaml</groupId>
170+
<artifactId>opensaml</artifactId>
171+
</exclusion>
154172
</exclusions>
155173
</dependency>
156174
<dependency>
@@ -163,6 +181,10 @@
163181
<groupId>org.apache.xalan</groupId>
164182
<artifactId>xalan</artifactId>
165183
</exclusion>
184+
<exclusion>
185+
<groupId>org.opensaml</groupId>
186+
<artifactId>opensaml</artifactId>
187+
</exclusion>
166188
</exclusions>
167189
</dependency>
168190
<dependency>
@@ -175,6 +197,10 @@
175197
<groupId>org.apache.xalan</groupId>
176198
<artifactId>xalan</artifactId>
177199
</exclusion>
200+
<exclusion>
201+
<groupId>org.opensaml</groupId>
202+
<artifactId>opensaml</artifactId>
203+
</exclusion>
178204
</exclusions>
179205
</dependency>
180206
<dependency>
@@ -240,6 +266,7 @@
240266
<dependency>
241267
<groupId>mysql</groupId>
242268
<artifactId>mysql-connector-java</artifactId>
269+
<version>${cs.mysql.version}</version>
243270
<scope>runtime</scope>
244271
</dependency>
245272
<dependency>

‎client/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
<dependency>
105105
<groupId>mysql</groupId>
106106
<artifactId>mysql-connector-java</artifactId>
107+
<version>${cs.mysql.version}</version>
107108
<scope>runtime</scope>
108109
</dependency>
109110
</dependencies>

‎client/tomcatconf/commands.properties.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15
260260
#### use that key...the key is stored in the db associated w/
261261
#### the userId...every request to the developer API should be
262262
#### checked against the key
263-
registerUserKeys=com.cloud.api.commands.RegisterCmd;1
263+
registerUserKeys=com.cloud.api.commands.RegisterCmd;15
264264

265265
### async-query command
266266
queryAsyncJobResult=com.cloud.api.commands.QueryAsyncJobResultCmd;15

‎docs/en-US/changing-secondary-storage-servers.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
under the License.
2323
-->
2424

25-
<section id="changing-secondary-storage-serversp">
25+
<section id="changing-secondary-storage-servers">
2626
<title>Changing Secondary Storage Servers</title>
2727
<para>You can change the secondary storage NFS mount. Perform the following steps to do so:</para>
2828
<orderedlist>

‎docs/en-US/changing-secondary-storage-serversp.xml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎docs/en-US/configure-xenserver-dom-memory.xml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎plugins/hypervisors/vmware/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@
3636
<groupId>com.cloud.com.vmware</groupId>
3737
<artifactId>vmware-vim25</artifactId>
3838
<version>${cs.vmware.api.version}</version>
39-
<scope>provided</scope>
39+
<scope>compile</scope>
4040
</dependency>
4141
<dependency>
4242
<groupId>com.cloud.com.vmware</groupId>
4343
<artifactId>vmware-vim</artifactId>
4444
<version>${cs.vmware.api.version}</version>
45-
<scope>provided</scope>
45+
<scope>compile</scope>
4646
</dependency>
4747
<dependency>
4848
<groupId>com.cloud.com.vmware</groupId>
4949
<artifactId>vmware-apputils</artifactId>
5050
<version>${cs.vmware.api.version}</version>
51-
<scope>provided</scope>
51+
<scope>compile</scope>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.apache.axis</groupId>

‎plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public Provider getProvider() {
173173
return Provider.NiciraNvp;
174174
}
175175

176-
private boolean canHandle(Network network, Service service) {
176+
protected boolean canHandle(Network network, Service service) {
177177
s_logger.debug("Checking if NiciraNvpElement can handle service "
178178
+ service.getName() + " on network " + network.getDisplayText());
179179
if (network.getBroadcastDomainType() != BroadcastDomainType.Lswitch) {
@@ -845,6 +845,7 @@ public boolean applyIps(Network network,
845845
ConfigurePublicIpsOnLogicalRouterCommand cmd = new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(),
846846
niciraNvpHost.getDetail("l3gatewayserviceuuid"), cidrs);
847847
ConfigurePublicIpsOnLogicalRouterAnswer answer = (ConfigurePublicIpsOnLogicalRouterAnswer) _agentMgr.easySend(niciraNvpHost.getId(), cmd);
848+
//FIXME answer can be null if the host is down
848849
return answer.getResult();
849850
}
850851
else {

‎plugins/network-elements/nicira-nvp/src/com/cloud/network/guru/NiciraNvpGuestNetworkGuru.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.cloud.agent.api.CreateLogicalSwitchCommand;
3030
import com.cloud.agent.api.DeleteLogicalSwitchAnswer;
3131
import com.cloud.agent.api.DeleteLogicalSwitchCommand;
32+
import com.cloud.dc.DataCenter;
3233
import com.cloud.dc.DataCenter.NetworkType;
3334
import com.cloud.dc.dao.DataCenterDao;
3435
import com.cloud.deploy.DeployDestination;
@@ -119,8 +120,9 @@ public Network design(NetworkOffering offering, DeploymentPlan plan,
119120
Network userSpecified, Account owner) {
120121
// Check of the isolation type of the related physical network is STT
121122
PhysicalNetworkVO physnet = _physicalNetworkDao.findById(plan.getPhysicalNetworkId());
122-
if (physnet == null || physnet.getIsolationMethods() == null || !physnet.getIsolationMethods().contains("STT")) {
123-
s_logger.debug("Refusing to design this network, the physical isolation type is not STT");
123+
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
124+
if (!canHandle(offering,dc.getNetworkType(),physnet)) {
125+
s_logger.debug("Refusing to design this network");
124126
return null;
125127
}
126128

@@ -199,6 +201,7 @@ public Network implement(Network network, NetworkOffering offering,
199201
s_logger.info("Implemented OK, network linked to = " + implemented.getBroadcastUri().toString());
200202
} catch (URISyntaxException e) {
201203
s_logger.error("Unable to store logical switch id in broadcast uri, uuid = " + implemented.getUuid(), e);
204+
return null;
202205
}
203206

204207
return implemented;

‎plugins/network-elements/nicira-nvp/src/com/cloud/network/nicira/NiciraNvpApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected HttpClient createHttpClient() {
8484
protected HttpMethod createMethod(String type, String uri) throws NiciraNvpApiException {
8585
String url;
8686
try {
87-
url = new URL(_protocol, _host, "/ws.v1/login").toString();
87+
url = new URL(_protocol, _host, uri).toString();
8888
} catch (MalformedURLException e) {
8989
s_logger.error("Unable to build Nicira API URL", e);
9090
throw new NiciraNvpApiException("Unable to build Nicira API URL", e);

0 commit comments

Comments
 (0)