From a1f9f465c34cc6d9bdeaac1a42cf5f429ef0caae Mon Sep 17 00:00:00 2001 From: Petr Chalupa Date: Thu, 5 Apr 2012 14:50:58 +0200 Subject: [PATCH] 713153 - RFE: include IP information in consumers/systems related API calls. --- cli/src/katello/client/core/system.py | 2 ++ src/app/models/system.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/cli/src/katello/client/core/system.py b/cli/src/katello/client/core/system.py index 80c267e6a5e..a2cf193bf91 100644 --- a/cli/src/katello/client/core/system.py +++ b/cli/src/katello/client/core/system.py @@ -71,6 +71,7 @@ def run(self): self.printer.setHeader(_("Systems List For Environment [ %s ] in Org [ %s ]") % (env_name, org_name)) self.printer.addColumn('name') + self.printer.addColumn('ipv4_address') self.printer.addColumn('serviceLevel', _('Service Level')) self.printer._grep = True @@ -121,6 +122,7 @@ def run(self): system["guests"] = "[ "+ ", ".join([guest["name"] for guest in system["guests"]]) +" ]" self.printer.addColumn('name') + self.printer.addColumn('ipv4_address') self.printer.addColumn('uuid') self.printer.addColumn('location') self.printer.addColumn('created_at', 'Registered', time_format=True) diff --git a/src/app/models/system.rb b/src/app/models/system.rb index 41c11cd9378..29e92ba21f8 100644 --- a/src/app/models/system.rb +++ b/src/app/models/system.rb @@ -146,6 +146,7 @@ def as_json(options) json['environment'] = environment.as_json unless environment.nil? json['activation_key'] = activation_keys.as_json unless activation_keys.nil? json['template'] = system_template.as_json unless system_template.nil? + json['ipv4_address'] = facts.try(:[], 'network.ipv4_address') if self.guest == 'true' json['host'] = self.host.attributes if self.host else