Skip to content

Commit c75fe80

Browse files
anthonyxuAlena Prokharchyk
anthonyxu
authored and
Alena Prokharchyk
committed
VPC : use routerProxy to call networkUsage.sh
Conflicts: core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
1 parent 251a91f commit c75fe80

13 files changed

Lines changed: 14 additions & 84 deletions

File tree

‎agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
239239
private String _createTmplPath;
240240
private String _heartBeatPath;
241241
private String _securityGroupPath;
242-
private String _networkUsagePath;
242+
private String _routerProxyPath;
243243
private String _host;
244244
private String _dcId;
245245
private String _pod;
@@ -543,11 +543,11 @@ public boolean configure(String name, Map<String, Object> params)
543543
"Unable to find the security_group.py");
544544
}
545545

546-
_networkUsagePath = Script.findScript("scripts/network/domr/",
547-
"networkUsage.sh");
548-
if (_networkUsagePath == null) {
546+
_routerProxyPath = Script.findScript("scripts/network/domr/",
547+
"routerProxy.sh");
548+
if (_routerProxyPath == null) {
549549
throw new ConfigurationException(
550-
"Unable to find the networkUsage.sh");
550+
"Unable to find the routerProxy.sh");
551551
}
552552

553553
String value = (String) params.get("developer");
@@ -2181,7 +2181,9 @@ private Answer execute(GetHostStatsCommand cmd) {
21812181

21822182
protected String networkUsage(final String privateIpAddress,
21832183
final String option, final String vif) {
2184-
Script getUsage = new Script(_networkUsagePath, s_logger);
2184+
Script getUsage = new Script(_routerProxyPath, s_logger);
2185+
getUsage.add("netusage.sh");
2186+
getUsage.add(privateIpAddress);
21852187
if (option.equals("get")) {
21862188
getUsage.add("-g");
21872189
} else if (option.equals("create")) {
@@ -2194,7 +2196,7 @@ protected String networkUsage(final String privateIpAddress,
21942196
getUsage.add("-d", vif);
21952197
}
21962198

2197-
getUsage.add("-i", privateIpAddress);
2199+
21982200
final OutputInterpreter.OneLineParser usageParser = new OutputInterpreter.OneLineParser();
21992201
String result = getUsage.execute(usageParser);
22002202
if (result != null) {

‎core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ protected Answer execute(DhcpEntryCommand cmd) {
10221022
protected Answer execute(CheckRouterCommand cmd) {
10231023
if (s_logger.isDebugEnabled()) {
10241024
s_logger.debug("Executing resource CheckRouterCommand: " + _gson.toJson(cmd));
1025-
s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /root/checkrouter.sh ");
1025+
s_logger.debug("Run command on domR " + cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP) + ", /opt/cloud/bin/checkrouter.sh ");
10261026
}
10271027

10281028
Pair<Boolean, String> result;

‎core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected void disableVlanNetwork(Connection conn, Network network) {
142142

143143
@Override
144144
protected String networkUsage(Connection conn, final String privateIpAddress, final String option, final String vif) {
145-
String args = null;
145+
String args = "netusage.sh " + privateIpAddress + " ";
146146
if (option.equals("get")) {
147147
args = "-g";
148148
} else if (option.equals("create")) {
@@ -157,9 +157,7 @@ protected String networkUsage(Connection conn, final String privateIpAddress, fi
157157
args += vif;
158158
}
159159

160-
args += " -i ";
161-
args += privateIpAddress;
162-
return callHostPlugin(conn, "vmops", "networkUsage", "args", args);
160+
return callHostPlugin(conn, "vmops", "routerProxy", "args", args);
163161
}
164162

165163
protected NetworkUsageAnswer execute(NetworkUsageCommand cmd) {

patches/systemvm/debian/config/root/guestnw.sh renamed to patches/systemvm/debian/config/opt/cloud/bin/guestnw.sh

File renamed without changes.

‎patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh‎

100644100755
File mode changed.

patches/systemvm/debian/config/root/netusage.sh renamed to patches/systemvm/debian/config/opt/cloud/bin/netusage.sh

File renamed without changes.

‎scripts/network/domr/networkUsage.sh‎

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

‎scripts/vm/hypervisor/xenserver/vmops‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -372,19 +372,6 @@ def deleteFile(session, args):
372372
return txt
373373

374374

375-
@echo
376-
def networkUsage(session, args):
377-
sargs = args['args']
378-
cmd = sargs.split(' ')
379-
cmd.insert(0, "/opt/xensource/bin/networkUsage.sh")
380-
cmd.insert(0, "/bin/bash")
381-
try:
382-
txt = util.pread2(cmd)
383-
except:
384-
util.SMlog(" network usage error " )
385-
txt = ''
386-
387-
return txt
388375

389376
def get_private_nic(session, args):
390377
vms = session.xenapi.VM.get_all()
@@ -1442,7 +1429,7 @@ if __name__ == "__main__":
14421429
"vm_data": vm_data, "savePassword": savePassword,
14431430
"saveDhcpEntry": saveDhcpEntry, "setFirewallRule": setFirewallRule, "routerProxy": routerProxy,
14441431
"setLoadBalancerRule": setLoadBalancerRule, "createFile": createFile, "deleteFile": deleteFile,
1445-
"networkUsage": networkUsage, "network_rules":network_rules,
1432+
"network_rules":network_rules,
14461433
"can_bridge_firewall":can_bridge_firewall, "default_network_rules":default_network_rules,
14471434
"destroy_network_rules_for_vm":destroy_network_rules_for_vm,
14481435
"default_network_rules_systemvm":default_network_rules_systemvm,

‎scripts/vm/hypervisor/xenserver/xcpserver/patch‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
2626
router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
2727
vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
2828
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
29-
networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
3029
call_firewall.sh=../../../../network/domr/,0755,/opt/xensource/bin
3130
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/xensource/bin
3231
l2tp_vpn.sh=../../../../network/domr/,0755,/opt/xensource/bin

‎scripts/vm/hypervisor/xenserver/xenserver56/patch‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pingtest.sh=../../..,0755,/opt/xensource/bin
2424
dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
2525
vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
2626
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
27-
networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
2827
call_firewall.sh=../../../../network/domr/,0755,/opt/xensource/bin
2928
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/xensource/bin
3029
router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin

0 commit comments

Comments
 (0)