Skip to content

Commit 6bd13e0

Browse files
committed
fix(cli): catalog keyerror
Signed-off-by: Chris Snow <[email protected]>
1 parent c22dee9 commit 6bd13e0

File tree

1 file changed

+64
-16
lines changed

1 file changed

+64
-16
lines changed

hpecp/catalog.py

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,82 +60,130 @@ class Catalog(AbstractResource):
6060
@property
6161
def label_name(self):
6262
"""@Field: from json['label']['name']"""
63-
return self.json["label"]["name"]
63+
try:
64+
return self.json["label"]["name"]
65+
except KeyError:
66+
return ""
6467

6568
@property
6669
def label_description(self):
6770
"""@Field: from json['label']['description']"""
68-
return self.json["label"]["description"]
71+
try:
72+
return self.json["label"]["description"]
73+
except KeyError:
74+
return ""
6975

7076
@property
7177
def self_href(self):
7278
"""@Field: from json['_links']['self']['href']"""
73-
return self.json["_links"]["self"]["href"]
79+
try:
80+
return self.json["_links"]["self"]["href"]
81+
except KeyError:
82+
return ""
7483

7584
@property
7685
def feed(self):
7786
"""@Field: from json['_links']['feed']"""
78-
return self.json["_links"]["feed"]
87+
try:
88+
return self.json["_links"]["feed"]
89+
except KeyError:
90+
return ""
7991

8092
@property
8193
def distro_id(self):
8294
"""@Field: from json['distro_id']"""
83-
return self.json["distro_id"]
95+
try:
96+
return self.json["distro_id"]
97+
except KeyError:
98+
return ""
8499

85100
@property
86101
def version(self):
87102
"""@Field: from json['version']"""
88-
return self.json["version"]
103+
try:
104+
return self.json["version"]
105+
except KeyError:
106+
return ""
89107

90108
@property
91109
def timestamp(self):
92110
"""@Field: from json['timestamp']"""
93-
return self.json["timestamp"]
111+
try:
112+
return self.json["timestamp"]
113+
except KeyError:
114+
return ""
94115

95116
@property
96117
def isdebug(self):
97118
"""@Field: from json['isdebug']"""
98-
return self.json["isdebug"]
119+
try:
120+
return self.json["isdebug"]
121+
except KeyError:
122+
return ""
99123

100124
@property
101125
def osclass(self):
102126
"""@Field: from json['osclass']"""
103-
return self.json["osclass"]
127+
try:
128+
return self.json["osclass"]
129+
except KeyError:
130+
return ""
104131

105132
@property
106133
def logo_checksum(self):
107134
"""@Field: from json['logo']['checksum']"""
108-
return self.json["logo"]["checksum"]
135+
try:
136+
return self.json["logo"]["checksum"]
137+
except KeyError:
138+
return ""
109139

110140
@property
111141
def logo_url(self):
112142
"""@Field: from json['logo']['url']"""
113-
return self.json["logo"]["url"]
143+
try:
144+
return self.json["logo"]["url"]
145+
except KeyError:
146+
return ""
114147

115148
@property
116149
def documentation_checksum(self):
117150
"""@Field: from json['documentation']['checksum']"""
118-
return self.json["documentation"]["checksum"]
151+
try:
152+
return self.json["documentation"]["checksum"]
153+
except KeyError:
154+
return ""
119155

120156
@property
121157
def documentation_mimetype(self):
122158
"""@Field: from json['documentation']['mimetype']"""
123-
return self.json["documentation"]["mimetype"]
159+
try:
160+
return self.json["documentation"]["mimetype"]
161+
except KeyError:
162+
return ""
124163

125164
@property
126165
def documentation_file(self):
127166
"""@Field: from json['documentation']['file']"""
128-
return self.json["documentation"]["file"]
167+
try:
168+
return self.json["documentation"]["file"]
169+
except KeyError:
170+
return ""
129171

130172
@property
131173
def state(self):
132174
"""@Field: from json['state']"""
133-
return self.json["state"]
175+
try:
176+
return self.json["state"]
177+
except KeyError:
178+
return ""
134179

135180
@property
136181
def state_info(self):
137182
"""@Field: from json['state_info']"""
138-
return self.json["state_info"]
183+
try:
184+
return self.json["state_info"]
185+
except KeyError:
186+
return ""
139187

140188

141189
class CatalogController(AbstractResourceController):

0 commit comments

Comments
 (0)