apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9074: API Changes: Add l2gatewayserviceuuid to NVP devices

Browse Source
This commit is contained in:
nvazquez 2015-12-01 11:46:22 -08:00 committed by nvazquez
parent 60f006569b
commit 46f9fbabdf
6 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/org/apache/cloudstack/api/ApiConstants.java
View File

@ -498,6 +498,7 @@ public class ApiConstants {
public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";
public static final String NICIRA_NVP_DEVICE_NAME = "niciradevicename";
public static final String NICIRA_NVP_GATEWAYSERVICE_UUID = "l3gatewayserviceuuid";
public static final String NICIRA_NVP_L2_GATEWAYSERVICE_UUID = "l2gatewayserviceuuid";
public static final String S3_ACCESS_KEY = "accesskey";
public static final String S3_SECRET_KEY = "secretkey";
public static final String S3_END_POINT = "endpoint";

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -942,6 +942,7 @@ label.nfs.storage=NFS Storage
label.nfs=NFS
label.nic.adapter.type=NIC adapter type
label.nicira.controller.address=Controller Address
label.nicira.l2gatewayserviceuuid=L2 Gateway Service Uuid
label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid
label.nicira.transportzoneuuid=Transport Zone Uuid
label.brocade.vcs.address=Vcs Switch Address

10
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java
View File

@ -80,6 +80,12 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
description = "The L3 Gateway Service UUID configured on the Nicira Controller")
private String l3gatewayserviceuuid;
@Parameter(name = ApiConstants.NICIRA_NVP_L2_GATEWAYSERVICE_UUID,
type = CommandType.STRING,
required = false,
description = "The L2 Gateway Service UUID configured on the Nicira Controller")
private String l2gatewayserviceuuid;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////
@ -108,6 +114,10 @@ public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd {
return l3gatewayserviceuuid;
}
public String getL2GatewayServiceUuid() {
return l2gatewayserviceuuid;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////

7
plugins/network-elements/nicira-nvp/src/main/java/com/cloud/api/response/NiciraNvpDeviceResponse.java
View File

@ -58,6 +58,10 @@ public class NiciraNvpDeviceResponse extends BaseResponse {
@Param(description = "this L3 gateway service Uuid")
private String l3GatewayServiceUuid;
@SerializedName(ApiConstants.NICIRA_NVP_L2_GATEWAYSERVICE_UUID)
@Param(description = "this L2 gateway service Uuid")
private String l2GatewayServiceUuid;
public void setId(String nvpDeviceId) {
this.id = nvpDeviceId;
}
@ -86,4 +90,7 @@ public class NiciraNvpDeviceResponse extends BaseResponse {
this.l3GatewayServiceUuid = l3GatewayServiceUuid;
}
public void setL2GatewayServiceUuid(final String l2GatewayServiceUuid) {
this.l2GatewayServiceUuid = l2GatewayServiceUuid;
}
}

1
ui/dictionary.jsp
View File

@ -934,6 +934,7 @@ dictionary = {
'label.nfs.storage': '<fmt:message key="label.nfs.storage" />',
'label.nic.adapter.type': '<fmt:message key="label.nic.adapter.type" />',
'label.nicira.controller.address': '<fmt:message key="label.nicira.controller.address" />',
'label.nicira.l2gatewayserviceuuid': '<fmt:message key="label.nicira.l2gatewayserviceuuid" />',
'label.nicira.l3gatewayserviceuuid': '<fmt:message key="label.nicira.l3gatewayserviceuuid" />',
'label.nicira.transportzoneuuid': '<fmt:message key="label.nicira.transportzoneuuid" />',
'label.brocade.vcs.address': '<fmt:message key="label.brocade.vcs.address" />',

21
ui/scripts/system.js
View File

@ -5774,6 +5774,9 @@
},
l3gatewayserviceuuid: {
label: 'label.nicira.l3gatewayserviceuuid'
},
l2gatewayserviceuuid: {
label: 'label.nicira.l2gatewayserviceuuid'
}
}
},
@ -12539,6 +12542,9 @@
},
l3gatewayserviceuuid: {
label: 'label.nicira.l3gatewayserviceuuid'
},
l2gatewayserviceuuid: {
label: 'label.nicira.l2gatewayserviceuuid'
}
},
actions: {
@ -12569,7 +12575,10 @@
},
l3gatewayserviceuuid: {
label: 'label.nicira.l3gatewayserviceuuid'
}
},
l2gatewayserviceuuid: {
label: 'label.nicira.l2gatewayserviceuuid'
}
}
},
action: function (args) {
@ -12687,7 +12696,10 @@
},
l3gatewayserviceuuid: {
label: 'label.nicira.l3gatewayserviceuuid'
}
},
l2gatewayserviceuuid: {
label: 'label.nicira.l2gatewayserviceuuid'
}
}],
dataProvider: function (args) {
$.ajax({
@ -20324,6 +20336,11 @@
if (l3GatewayServiceUuid != null && l3GatewayServiceUuid.length > 0) {
array1.push("&l3gatewayserviceuuid=" + todb(args.data.l3gatewayserviceuuid));
}
var l2GatewayServiceUuid = args.data.l2gatewayserviceuuid;
if (l2GatewayServiceUuid != null && l2GatewayServiceUuid.length > 0) {
array1.push("&l2gatewayserviceuuid=" + todb(args.data.l2gatewayserviceuuid));
}
$.ajax({
url: createURL(apiCmd + array1.join("")),