Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E6F210CD7 for ; Fri, 7 Jun 2013 09:33:39 +0000 (UTC) Received: (qmail 70432 invoked by uid 500); 7 Jun 2013 09:33:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 70255 invoked by uid 500); 7 Jun 2013 09:33:38 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70248 invoked by uid 99); 7 Jun 2013 09:33:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jun 2013 09:33:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5592B8A00D1; Fri, 7 Jun 2013 09:33:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Message-Id: <7bb8c46b8b01457097593b1139f76382@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 302741d Date: Fri, 7 Jun 2013 09:33:37 +0000 (UTC) Updated Branches: refs/heads/master 1c9cd9d36 -> 302741d30 Log the actual NAT ip attempting to SSH into VM IP is the guest IP and it's the NAT ip that is used for ssh. Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/302741d3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/302741d3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/302741d3 Branch: refs/heads/master Commit: 302741d309f335c1f8c3a36286bec513fd9ed2f4 Parents: 1c9cd9d Author: Prasanna Santhanam Authored: Fri Jun 7 15:02:55 2013 +0530 Committer: Prasanna Santhanam Committed: Fri Jun 7 15:02:55 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_network.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/302741d3/test/integration/smoke/test_network.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py index eb33c63..a65748d 100644 --- a/test/integration/smoke/test_network.py +++ b/test/integration/smoke/test_network.py @@ -1209,7 +1209,7 @@ class TestRebootRouter(cloudstackTestCase): except Exception as e: self.fail( "SSH Access failed for %s: %s" % \ - (self.vm_1.ipaddress, e)) + (self.nat_rule.ipaddress.ipaddress, e)) return def tearDown(self):