"User-Agent": "csit agent",
},
auth=("admin", "admin"),
+ timeout=10.0,
)
info(
- "Response %s ",
+ "Response %s",
resp,
)
+ info(
+ "Response JSON %s",
+ resp.json(),
+ )
- return resp.json()
+ if resp.status_code == status_codes["bad_request"]:
+ info(
+ "Status code is '%s' - trying operational data instead.",
+ resp.status_code,
+ )
+ result = get_entities_data(restconf_url)
+ else:
+ result = resp.json()
+
+ return result
+
+
+def get_entity_name(e_type, e_name):
+ """
+ Get the effective entity name for the given entity type.
+ If the entity type is not for odl-general-entity, entity name
+ should be the full instance identifier.
+ :param e_type: entity type
+ :param e_name: entity name
+ :return: updated entity name
+ """
+ name_templates = {
+ "ovsdb": "/network-topology:network-topology/topology[topology-id='ovsdb:1']/node[node-id='%s']",
+ }
+
+ if e_type in name_templates:
+ return name_templates[e_type] % e_name
+ else:
+ return e_name
def get_entity(restconf_url, e_type, e_name):
}
""" % (
e_type,
- e_name,
+ get_entity_name(e_type, e_name),
)
info("Data %s", data)
},
data=data,
auth=("admin", "admin"),
+ timeout=10.0,
)
info(
- "Entity json %s",
+ "Response %s",
+ resp,
+ )
+ info(
+ "Response JSON %s",
resp.json(),
)
}
""" % (
e_type,
- e_name,
+ get_entity_name(e_type, e_name),
)
info("Data %s", data)
},
data=data,
auth=("admin", "admin"),
+ timeout=10.0,
)
info(
- "Response %s ",
+ "Response %s",
resp,
)
+ info(
+ "Response JSON %s",
+ resp.json(),
+ )
if resp.status_code == status_codes["bad_request"]:
info(
return result
+def get_entities_data(restconf_url):
+ """
+ Get the entity information from the datastore for Silicon
+ or earlier versions.
+ :param restconf_url: RESTCONF URL up to the RESTCONF root
+ """
+ resp = get(
+ url=restconf_url + "/data/entity-owners:entity-owners",
+ headers={
+ "Accept": "application/yang-data+json",
+ "User-Agent": "csit agent",
+ },
+ auth=("admin", "admin"),
+ timeout=10.0,
+ )
+
+ info(
+ "Response %s",
+ resp,
+ )
+ info(
+ "Response JSON %s",
+ resp.json(),
+ )
+
+ return resp.json()
+
+
def get_entity_type_data(restconf_url, e_type):
"""
Get the entity information for the given entity type from the datastore
"User-Agent": "csit agent",
},
auth=("admin", "admin"),
+ timeout=10.0,
)
info(
- "Response %s ",
+ "Response %s",
resp,
)
info(
- "Entity json %s",
+ "Response JSON %s",
resp.json(),
)