vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arku...@apache.org
Subject svn commit: r1644766 - in /vcl/trunk/managementnode/lib/VCL/Module: OS.pm OS/Linux/firewall/iptables.pm Provisioning/VMware/VMware.pm
Date Thu, 11 Dec 2014 21:00:50 GMT
Author: arkurth
Date: Thu Dec 11 21:00:50 2014
New Revision: 1644766

URL: http://svn.apache.org/r1644766
Log:
VCL-174
Made minor changes to vcld.log output related to NAT.

Modified:
    vcl/trunk/managementnode/lib/VCL/Module/OS.pm
    vcl/trunk/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm
    vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm

Modified: vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1644766&r1=1644765&r2=1644766&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS.pm Thu Dec 11 21:00:50 2014
@@ -2812,7 +2812,7 @@ sub process_connect_methods {
 					}
 					
 					if ($self->nathost_os->firewall->add_nat_port_forward($protocol, $nat_public_port,
$computer_ip_address, $port, $reservation_id)) {
-						notify($ERRORS{'OK'}, 0, "NAT port forwarding configured on $nathost_hostname for '$name'
connect method: $nat_public_port --> $computer_ip_address:$port ($protocol)");
+						notify($ERRORS{'OK'}, 0, "NAT port forwarding configured on $nathost_hostname for '$name'
connect method: $nathost_public_ip_address:$nat_public_port --> $computer_ip_address:$port
($protocol)");
 					}
 					else {
 						notify($ERRORS{'WARNING'}, 0, "failed to configure NAT port forwarding on $nathost_hostname
for '$name' connect method: $nathost_public_ip_address:$nat_public_port --> $computer_ip_address:$port
($protocol)");

Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm?rev=1644766&r1=1644765&r2=1644766&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux/firewall/iptables.pm Thu Dec 11 21:00:50
2014
@@ -663,7 +663,10 @@ sub configure_nat {
 		notify($ERRORS{'WARNING'}, 0, "failed to configure NAT host $computer_name, no interface
is assigned the internal IP address configured in the nathost table: $internal_ip_address\n"
. format_data($network_configuration));
 		return;
 	}
-	
+	notify($ERRORS{'DEBUG'}, 0, "determined NAT host interfaces:\n" .
+		"public: $public_interface_name ($public_ip_address)\n" .
+		"internal: $internal_interface_name: ($internal_ip_address)"
+	);
 	
 	my $natport_ranges_variable = get_variable('natport_ranges') || '49152-65535';
 	my $destination_ports = '';
@@ -677,7 +680,6 @@ sub configure_nat {
 		$destination_ports .= "$start_port:$end_port";
 	}
 	
-	
 	if (!$self->insert_rule({
 		'table' => 'nat',
 		'chain' => 'POSTROUTING',

Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1644766&r1=1644765&r2=1644766&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Thu Dec 11 21:00:50
2014
@@ -284,7 +284,7 @@ sub initialize {
 		return;
 	}
 	
-	#return 1 if ($self->data->get_request_state_name() =~ /test/i);
+	return 1 if ($self->data->get_request_state_name() =~ /test/i);
 	notify($ERRORS{'DEBUG'}, 0, "initializing " . ref($self) . " object");
 	
 	# Get a DataStructure object containing data for the VM host computer



Mime
View raw message