mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-15 21:29:52 +05:00
Added new dataconverter *string2hex
This commit is contained in:
committed by
Dan Christian Bogos
parent
93af73cc2b
commit
f6c1fa4eaa
@@ -667,6 +667,7 @@ const (
|
||||
MetaLibPhoneNumber = "*libphonenumber"
|
||||
MetaTimeString = "*time_string"
|
||||
MetaIP2Hex = "*ip2hex"
|
||||
MetaString2Hex = "*string2hex"
|
||||
MetaSIPURIMethod = "*sipuri_method"
|
||||
MetaSIPURIHost = "*sipuri_host"
|
||||
MetaSIPURIUser = "*sipuri_user"
|
||||
|
||||
@@ -76,6 +76,8 @@ func NewDataConverter(params string) (conv DataConverter, err error) {
|
||||
return NewDurationConverter("")
|
||||
case params == MetaIP2Hex:
|
||||
return new(IP2HexConverter), nil
|
||||
case params == MetaString2Hex:
|
||||
return new(String2HexConverter), nil
|
||||
case params == MetaSIPURIHost:
|
||||
return new(SIPURIHostConverter), nil
|
||||
case params == MetaSIPURIUser:
|
||||
@@ -358,3 +360,17 @@ func (tS *TimeStringConverter) Convert(in interface{}) (
|
||||
}
|
||||
return tm.Format(tS.Layout), nil
|
||||
}
|
||||
|
||||
// String2HexConverter will transform the string to hex
|
||||
type String2HexConverter struct{}
|
||||
|
||||
// Convert implements DataConverter interface
|
||||
func (*String2HexConverter) Convert(in interface{}) (o interface{}, err error) {
|
||||
var out string
|
||||
if out = hex.EncodeToString([]byte(IfaceAsString(in))); len(out) == 0 {
|
||||
o = out
|
||||
return
|
||||
}
|
||||
o = "0x" + out
|
||||
return
|
||||
}
|
||||
|
||||
@@ -142,6 +142,14 @@ func TestNewDataConverter(t *testing.T) {
|
||||
if _, err := NewDataConverter("unsupported"); err == nil || err.Error() != "unsupported converter definition: <unsupported>" {
|
||||
}
|
||||
|
||||
hex, err := NewDataConverter(MetaString2Hex)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
exp := new(String2HexConverter)
|
||||
if !reflect.DeepEqual(hex, exp) {
|
||||
t.Errorf("Expected %+v received: %+v", exp, hex)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewDataConverterMustCompile(t *testing.T) {
|
||||
@@ -789,4 +797,36 @@ func TestNewTimeStringConverter(t *testing.T) {
|
||||
} else if rcv.(string) != exp {
|
||||
t.Errorf("Expecting: %+v, received: %+v", exp, rcv)
|
||||
}
|
||||
func TestStringHexConvertor(t *testing.T) {
|
||||
hx := new(String2HexConverter)
|
||||
val := "127.0.0.1"
|
||||
expected := "0x3132372e302e302e31"
|
||||
if rpl, err := hx.Convert(val); err != nil {
|
||||
t.Error(err)
|
||||
} else if !reflect.DeepEqual(expected, rpl) {
|
||||
t.Errorf("expecting: %+v, received: %+v", expected, rpl)
|
||||
}
|
||||
|
||||
val3 := []byte("127.0.0.1")
|
||||
if rpl, err := hx.Convert(val3); err != nil {
|
||||
t.Error(err)
|
||||
} else if !reflect.DeepEqual(expected, rpl) {
|
||||
t.Errorf("expecting: %+v, received: %+v", expected, rpl)
|
||||
}
|
||||
|
||||
val = ""
|
||||
expected = ""
|
||||
if rpl, err := hx.Convert(val); err != nil {
|
||||
t.Error(err)
|
||||
} else if !reflect.DeepEqual(expected, rpl) {
|
||||
t.Errorf("expecting: %+v, received: %+v", expected, rpl)
|
||||
}
|
||||
|
||||
val3 = []byte{0x94, 0x71, 0x02, 0x31, 0x01, 0x59}
|
||||
expected = "0x947102310159"
|
||||
if rpl, err := hx.Convert(val3); err != nil {
|
||||
t.Error(err)
|
||||
} else if !reflect.DeepEqual(expected, rpl) {
|
||||
t.Errorf("expecting: %+v, received: %+v", expected, rpl)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user