johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

console/query: SrcVlan/DstVlan as a dimension

Browse Source 
Make the code more generic for IPv6 types and UInt types to
format them correctly.

Fix #623
This commit is contained in:
Vincent Bernat
2023-04-12 20:58:26 +02:00
parent 367e7f0036
commit b5cc995557
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
console/query/column_test.go
View File

@@ -45,6 +45,7 @@ func TestUnmarshalQueryColumn(t *testing.T) {
}
func TestQueryColumnSQLSelect(t *testing.T) {
sch := schema.NewMock(t)
cases := []struct {
Input schema.ColumnKey
Expected string
@@ -52,6 +53,12 @@ func TestQueryColumnSQLSelect(t *testing.T) {
{
Input: schema.ColumnSrcAddr,
Expected: `replaceRegexpOne(IPv6NumToString(SrcAddr), '^::ffff:', '')`,
}, {
Input: schema.ColumnDstAddrNAT,
Expected: `replaceRegexpOne(IPv6NumToString(DstAddrNAT), '^::ffff:', '')`,
}, {
Input: schema.ColumnExporterAddress,
Expected: `replaceRegexpOne(IPv6NumToString(ExporterAddress), '^::ffff:', '')`,
}, {
Input: schema.ColumnDstAS,
Expected: `concat(toString(DstAS), ': ', dictGetOrDefault('asns', 'name', DstAS, '???'))`,
@@ -67,6 +74,9 @@ func TestQueryColumnSQLSelect(t *testing.T) {
}, {
Input: schema.ColumnOutIfSpeed,
Expected: `toString(OutIfSpeed)`,
}, {
Input: schema.ColumnDstVlan,
Expected: `toString(DstVlan)`,
}, {
Input: schema.ColumnExporterName,
Expected: `ExporterName`,
@@ -90,7 +100,7 @@ func TestQueryColumnSQLSelect(t *testing.T) {
if err := column.Validate(schema.NewMock(t).EnableAllColumns()); err != nil {
t.Fatalf("Validate() error:\n%+v", err)
}
got := column.ToSQLSelect()
got := column.ToSQLSelect(sch)
if diff := helpers.Diff(got, tc.Expected); diff != "" {
t.Errorf("toSQLWhere (-got, +want):\n%s", diff)
}