Skip to content

Commit 5ce373f

Browse files
authored
Merge pull request #253 from hpe-container-platform-community/snowch/implement-datatap-module-250
fix(datatap): update list fields
2 parents ff96f26 + c4009d9 commit 5ce373f

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

hpecp/datatap.py

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,19 @@ class Datatap(AbstractResource):
3030
# Platform API.
3131
# TODO: Verify this with the specification
3232
all_fields = (
33+
"self_href",
3334
"label_name",
3435
"label_description",
35-
"self_href",
36-
# "state",
37-
# "state_info",
36+
"type",
37+
"status",
3838
)
3939

4040
default_display_fields = [
41+
"self_href",
4142
"label_name",
4243
"label_description",
43-
"self_href",
44+
"type",
45+
"status",
4446
]
4547

4648
# These fields are displayed by default, e.g. in tabulate()
@@ -50,17 +52,25 @@ class Datatap(AbstractResource):
5052

5153
@property
5254
def label_name(self):
53-
"""@Field: from json['label']['name']."""
55+
"""@Field: from json['_embedded']['name']."""
5456
try:
55-
return self.json["label"]["name"]
57+
return self.json["_embedded"]["name"]
5658
except KeyError:
5759
return ""
5860

5961
@property
6062
def label_description(self):
61-
"""@Field: from json['label']['description']."""
63+
"""@Field: from json['_embedded']['description']."""
6264
try:
63-
return self.json["label"]["description"]
65+
return self.json["_embedded"]["description"]
66+
except KeyError:
67+
return ""
68+
69+
@property
70+
def type(self):
71+
"""@Field: from json['_embedded']['endpoint']['type']."""
72+
try:
73+
return self.json["_embedded"]["endpoint"]["type"]
6474
except KeyError:
6575
return ""
6676

@@ -72,21 +82,13 @@ def self_href(self):
7282
except KeyError:
7383
return ""
7484

75-
# @property
76-
# def state(self):
77-
# """@Field: from json['state']"""
78-
# try:
79-
# return self.json["state"]
80-
# except KeyError:
81-
# return ""
82-
83-
# @property
84-
# def state_info(self):
85-
# """@Field: from json['state_info']"""
86-
# try:
87-
# return self.json["state_info"]
88-
# except KeyError:
89-
# return ""
85+
@property
86+
def status(self):
87+
"""@Field: from json['_embedded']['status']."""
88+
try:
89+
return self.json["_embedded"]["status"]
90+
except KeyError:
91+
return ""
9092

9193

9294
class DatatapController(AbstractResourceController):

0 commit comments

Comments
 (0)