Skip to content

Commit

Permalink
remove "_id" from properties and change stray ints to floats in pyt…
Browse files Browse the repository at this point in the history 
…hon tests
  • Loading branch information
@ljeub-pometry
ljeub-pometry committed Sep 18, 2023
1 parent 77e2379 commit 5588ab6
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 17 deletions.
2 changes: 1 addition & 1 deletion python/tests/expected/dataframe_output/vertex_df_all.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"server_name":"Alpha","hardware_type":"Blade Server","datasource":"data\/network_traffic_edges.csv","_id":"ServerA","primary_function":[[1693555200000,"Database"],[1693555260000,"Database"],[1693555320000,"Database"]],"uptime_days":[[1693555200000,120],[1693555260000,121],[1693555320000,122]],"OS_version":[[1693555200000,"Ubuntu 20.04"],[1693555260000,"Ubuntu 20.04"],[1693555320000,"Ubuntu 20.04"]]},"1":{"_id":"ServerB","datasource":"data\/network_traffic_edges.csv","hardware_type":"Rack Server","server_name":"Beta","uptime_days":[[1693555500000,45]],"OS_version":[[1693555500000,"Red Hat 8.1"]],"primary_function":[[1693555500000,"Web Server"]]},"2":{"_id":"ServerC","server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","OS_version":[[1693555800000,"Windows Server 2022"]],"primary_function":[[1693555800000,"File Storage"]],"uptime_days":[[1693555800000,90]]},"3":{"_id":"ServerD","datasource":"data\/network_traffic_edges.csv","server_name":"Delta","hardware_type":"Tower Server","uptime_days":[[1693556100000,60]],"OS_version":[[1693556100000,"Ubuntu 20.04"]],"primary_function":[[1693556100000,"Application Server"]]},"4":{"server_name":"Echo","hardware_type":"Rack Server","datasource":"data\/network_traffic_edges.csv","_id":"ServerE","primary_function":[[1693556400000,"Backup"]],"OS_version":[[1693556400000,"Red Hat 8.1"]],"uptime_days":[[1693556400000,30]]}},"update_history":{"0":[1693555200000,1693555260000,1693555320000,1693555500000,1693556400000],"1":[1693555200000,1693555500000,1693555800000,1693556700000],"2":[1693555500000,1693555800000,1693556400000,1693557000000,1693557060000,1693557120000],"3":[1693555800000,1693556100000,1693557000000,1693557060000,1693557120000],"4":[1693556100000,1693556400000,1693556700000]}}
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"server_name":"Alpha","hardware_type":"Blade Server","datasource":"data\/network_traffic_edges.csv","primary_function":[[1693555200000,"Database"],[1693555260000,"Database"],[1693555320000,"Database"]],"uptime_days":[[1693555200000,120],[1693555260000,121],[1693555320000,122]],"OS_version":[[1693555200000,"Ubuntu 20.04"],[1693555260000,"Ubuntu 20.04"],[1693555320000,"Ubuntu 20.04"]]},"1":{"datasource":"data\/network_traffic_edges.csv","hardware_type":"Rack Server","server_name":"Beta","uptime_days":[[1693555500000,45]],"OS_version":[[1693555500000,"Red Hat 8.1"]],"primary_function":[[1693555500000,"Web Server"]]},"2":{"server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","OS_version":[[1693555800000,"Windows Server 2022"]],"primary_function":[[1693555800000,"File Storage"]],"uptime_days":[[1693555800000,90]]},"3":{"datasource":"data\/network_traffic_edges.csv","server_name":"Delta","hardware_type":"Tower Server","uptime_days":[[1693556100000,60]],"OS_version":[[1693556100000,"Ubuntu 20.04"]],"primary_function":[[1693556100000,"Application Server"]]},"4":{"server_name":"Echo","hardware_type":"Rack Server","datasource":"data\/network_traffic_edges.csv","primary_function":[[1693556400000,"Backup"]],"OS_version":[[1693556400000,"Red Hat 8.1"]],"uptime_days":[[1693556400000,30]]}},"update_history":{"0":[1693555200000,1693555260000,1693555320000,1693555500000,1693556400000],"1":[1693555200000,1693555500000,1693555800000,1693556700000],"2":[1693555500000,1693555800000,1693556400000,1693557000000,1693557060000,1693557120000],"3":[1693555800000,1693556100000,1693557000000,1693557060000,1693557120000],"4":[1693556100000,1693556400000,1693556700000]}}
2 changes: 1 addition & 1 deletion python/tests/expected/dataframe_output/vertex_df_no_hist.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"datasource":"data\/network_traffic_edges.csv","server_name":"Alpha","hardware_type":"Blade Server","_id":"ServerA","OS_version":[[1693555200000,"Ubuntu 20.04"],[1693555260000,"Ubuntu 20.04"],[1693555320000,"Ubuntu 20.04"]],"uptime_days":[[1693555200000,120],[1693555260000,121],[1693555320000,122]],"primary_function":[[1693555200000,"Database"],[1693555260000,"Database"],[1693555320000,"Database"]]},"1":{"datasource":"data\/network_traffic_edges.csv","_id":"ServerB","hardware_type":"Rack Server","server_name":"Beta","primary_function":[[1693555500000,"Web Server"]],"uptime_days":[[1693555500000,45]],"OS_version":[[1693555500000,"Red Hat 8.1"]]},"2":{"hardware_type":"Blade Server","_id":"ServerC","server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","uptime_days":[[1693555800000,90]],"OS_version":[[1693555800000,"Windows Server 2022"]],"primary_function":[[1693555800000,"File Storage"]]},"3":{"server_name":"Delta","hardware_type":"Tower Server","datasource":"data\/network_traffic_edges.csv","_id":"ServerD","uptime_days":[[1693556100000,60]],"OS_version":[[1693556100000,"Ubuntu 20.04"]],"primary_function":[[1693556100000,"Application Server"]]},"4":{"datasource":"data\/network_traffic_edges.csv","hardware_type":"Rack Server","server_name":"Echo","_id":"ServerE","uptime_days":[[1693556400000,30]],"OS_version":[[1693556400000,"Red Hat 8.1"]],"primary_function":[[1693556400000,"Backup"]]}}}
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"datasource":"data\/network_traffic_edges.csv","server_name":"Alpha","hardware_type":"Blade Server","OS_version":[[1693555200000,"Ubuntu 20.04"],[1693555260000,"Ubuntu 20.04"],[1693555320000,"Ubuntu 20.04"]],"uptime_days":[[1693555200000,120],[1693555260000,121],[1693555320000,122]],"primary_function":[[1693555200000,"Database"],[1693555260000,"Database"],[1693555320000,"Database"]]},"1":{"datasource":"data\/network_traffic_edges.csv","hardware_type":"Rack Server","server_name":"Beta","primary_function":[[1693555500000,"Web Server"]],"uptime_days":[[1693555500000,45]],"OS_version":[[1693555500000,"Red Hat 8.1"]]},"2":{"hardware_type":"Blade Server","server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","uptime_days":[[1693555800000,90]],"OS_version":[[1693555800000,"Windows Server 2022"]],"primary_function":[[1693555800000,"File Storage"]]},"3":{"server_name":"Delta","hardware_type":"Tower Server","datasource":"data\/network_traffic_edges.csv","uptime_days":[[1693556100000,60]],"OS_version":[[1693556100000,"Ubuntu 20.04"]],"primary_function":[[1693556100000,"Application Server"]]},"4":{"datasource":"data\/network_traffic_edges.csv","hardware_type":"Rack Server","server_name":"Echo","uptime_days":[[1693556400000,30]],"OS_version":[[1693556400000,"Red Hat 8.1"]],"primary_function":[[1693556400000,"Backup"]]}}}
2 changes: 1 addition & 1 deletion python/tests/expected/dataframe_output/vertex_df_no_prop_hist.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"_id":"ServerA","server_name":"Alpha","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","uptime_days":122,"OS_version":"Ubuntu 20.04","primary_function":"Database"},"1":{"primary_function":"Web Server","_id":"ServerB","server_name":"Beta","OS_version":"Red Hat 8.1","hardware_type":"Rack Server","datasource":"data\/network_traffic_edges.csv","uptime_days":45},"2":{"primary_function":"File Storage","server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","OS_version":"Windows Server 2022","_id":"ServerC","uptime_days":90},"3":{"primary_function":"Application Server","OS_version":"Ubuntu 20.04","_id":"ServerD","server_name":"Delta","datasource":"data\/network_traffic_edges.csv","uptime_days":60,"hardware_type":"Tower Server"},"4":{"primary_function":"Backup","hardware_type":"Rack Server","_id":"ServerE","OS_version":"Red Hat 8.1","datasource":"data\/network_traffic_edges.csv","uptime_days":30,"server_name":"Echo"}},"update_history":{"0":[1693555200000,1693555260000,1693555320000,1693555500000,1693556400000],"1":[1693555200000,1693555500000,1693555800000,1693556700000],"2":[1693555500000,1693555800000,1693556400000,1693557000000,1693557060000,1693557120000],"3":[1693555800000,1693556100000,1693557000000,1693557060000,1693557120000],"4":[1693556100000,1693556400000,1693556700000]}}
{"id":{"0":"ServerA","1":"ServerB","2":"ServerC","3":"ServerD","4":"ServerE"},"properties":{"0":{"server_name":"Alpha","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","uptime_days":122,"OS_version":"Ubuntu 20.04","primary_function":"Database"},"1":{"primary_function":"Web Server","server_name":"Beta","OS_version":"Red Hat 8.1","hardware_type":"Rack Server","datasource":"data\/network_traffic_edges.csv","uptime_days":45},"2":{"primary_function":"File Storage","server_name":"Charlie","datasource":"data\/network_traffic_edges.csv","hardware_type":"Blade Server","OS_version":"Windows Server 2022","uptime_days":90},"3":{"primary_function":"Application Server","OS_version":"Ubuntu 20.04","server_name":"Delta","datasource":"data\/network_traffic_edges.csv","uptime_days":60,"hardware_type":"Tower Server"},"4":{"primary_function":"Backup","hardware_type":"Rack Server","OS_version":"Red Hat 8.1","datasource":"data\/network_traffic_edges.csv","uptime_days":30,"server_name":"Echo"}},"update_history":{"0":[1693555200000,1693555260000,1693555320000,1693555500000,1693556400000],"1":[1693555200000,1693555500000,1693555800000,1693556700000],"2":[1693555500000,1693555800000,1693556400000,1693557000000,1693557060000,1693557120000],"3":[1693555800000,1693556100000,1693557000000,1693557060000,1693557120000],"4":[1693556100000,1693556400000,1693556700000]}}
10 changes: 0 additions & 10 deletions python/tests/test_graph_conversions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ def test_networkx_full_history():
(1693555260000, "Ubuntu 20.04"),
(1693555320000, "Ubuntu 20.04"),
],
"_id": "ServerA",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Blade Server",
"primary_function": [
Expand All @@ -188,7 +187,6 @@ def test_networkx_full_history():
"ServerB",
{
"OS_version": [(1693555500000, "Red Hat 8.1")],
"_id": "ServerB",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Rack Server",
"primary_function": [(1693555500000, "Web Server")],
Expand All @@ -206,7 +204,6 @@ def test_networkx_full_history():
"ServerC",
{
"OS_version": [(1693555800000, "Windows Server 2022")],
"_id": "ServerC",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Blade Server",
"primary_function": [(1693555800000, "File Storage")],
Expand All @@ -226,7 +223,6 @@ def test_networkx_full_history():
"ServerD",
{
"OS_version": [(1693556100000, "Ubuntu 20.04")],
"_id": "ServerD",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Tower Server",
"primary_function": [(1693556100000, "Application Server")],
Expand All @@ -245,7 +241,6 @@ def test_networkx_full_history():
"ServerE",
{
"OS_version": [(1693556400000, "Red Hat 8.1")],
"_id": "ServerE",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Rack Server",
"primary_function": [(1693556400000, "Backup")],
Expand Down Expand Up @@ -656,7 +651,6 @@ def test_networkx_no_history():
"ServerA",
{
"OS_version": "Ubuntu 20.04",
"_id": "ServerA",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Blade Server",
"primary_function": "Database",
Expand All @@ -668,7 +662,6 @@ def test_networkx_no_history():
"ServerB",
{
"OS_version": "Red Hat 8.1",
"_id": "ServerB",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Rack Server",
"primary_function": "Web Server",
Expand All @@ -680,7 +673,6 @@ def test_networkx_no_history():
"ServerC",
{
"OS_version": "Windows Server 2022",
"_id": "ServerC",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Blade Server",
"primary_function": "File Storage",
Expand All @@ -692,7 +684,6 @@ def test_networkx_no_history():
"ServerD",
{
"OS_version": "Ubuntu 20.04",
"_id": "ServerD",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Tower Server",
"primary_function": "Application Server",
Expand All @@ -704,7 +695,6 @@ def test_networkx_no_history():
"ServerE",
{
"OS_version": "Red Hat 8.1",
"_id": "ServerE",
"datasource": "data/network_traffic_edges.csv",
"hardware_type": "Rack Server",
"primary_function": "Backup",
Expand Down
8 changes: 4 additions & 4 deletions python/tests/test_graphdb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def create_graph():

g.add_vertex(0, 1, {"type": "wallet", "cost": 99.5})
g.add_vertex(-1, 2, {"type": "wallet", "cost": 10.0})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76.0})

for e in edges:
g.add_edge(e[0], e[1], e[2], {"prop1": 1, "prop2": 9.8, "prop3": "test"})
Expand All @@ -32,7 +32,7 @@ def create_graph_with_deletions():

g.add_vertex(0, 1, {"type": "wallet", "cost": 99.5})
g.add_vertex(-1, 2, {"type": "wallet", "cost": 10.0})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76.0})

for e in edges:
g.add_edge(e[0], e[1], e[2], {"prop1": 1, "prop2": 9.8, "prop3": "test"})
Expand Down Expand Up @@ -832,7 +832,7 @@ def test_save_load_graph():
g = create_graph()
g.add_vertex(1, 11, {"type": "wallet", "balance": 99.5})
g.add_vertex(2, 12, {"type": "wallet", "balance": 10.0})
g.add_vertex(3, 13, {"type": "wallet", "balance": 76})
g.add_vertex(3, 13, {"type": "wallet", "balance": 76.0})
g.add_edge(4, 11, 12, {"prop1": 1, "prop2": 9.8, "prop3": "test"})
g.add_edge(5, 12, 13, {"prop1": 1321, "prop2": 9.8, "prop3": "test"})
g.add_edge(6, 13, 11, {"prop1": 645, "prop2": 9.8, "prop3": "test"})
Expand Down Expand Up @@ -1570,7 +1570,7 @@ def test_materialize_graph():

g.add_vertex(0, 1, {"type": "wallet", "cost": 99.5})
g.add_vertex(-1, 2, {"type": "wallet", "cost": 10.0})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76})
g.add_vertex(6, 3, {"type": "wallet", "cost": 76.0})
g.add_vertex(6, 4).add_constant_properties({"abc": "xyz"})

for e in edges:
Expand Down

0 comments on commit 5588ab6

Please sign in to comment.