alarm-go rmr init cleaned

[ric-plt/alarm-go.git] / alarm / types.go

diff --git a/alarm/types.go b/alarm/types.go
index b61f436..5954c73 100755 (executable)
--- a/alarm/types.go
+++ b/alarm/types.go
@@ -21,10 +21,10 @@
 package alarm
 
 import (
+       "fmt"
+       "os"
        "sync"
        "unsafe"
-       "os"
-       "fmt"
 )
 
 import "C"
@@ -49,8 +49,8 @@ type Alarm struct {
        ApplicationId     string   `json:"applicationId"`
        SpecificProblem   int      `json:"specificProblem"`
        PerceivedSeverity Severity `json:"perceivedSeverity"`
-       AdditionalInfo    string   `json:"additionalInfo"`
        IdentifyingInfo   string   `json:"identifyingInfo"`
+       AdditionalInfo    string   `json:"additionalInfo"`
 }
 
 // Alarm actions
@@ -76,12 +76,13 @@ type AlarmConfigParams struct {
 
 // RICAlarm is an alarm instance
 type RICAlarm struct {
-       moId       string
-       appId      string
-       managerUrl string
-       rmrCtx     unsafe.Pointer
-       rmrReady   bool
-       mutex      sync.Mutex
+       moId        string
+       appId       string
+       managerUrl  string
+       rmrEndpoint string
+       rmrCtx      unsafe.Pointer
+       rmrReady    bool
+       mutex       sync.Mutex
 }
 
 const (
@@ -91,7 +92,7 @@ const (
 
 // Temp alarm constants & definitions
 const (
-       E2_CONNECTION_PROBLEM     int = 72004
+       E2_CONNECTION_PROBLEM              int = 72004
        ACTIVE_ALARM_EXCEED_MAX_THRESHOLD  int = 72007
        ALARM_HISTORY_EXCEED_MAX_THRESHOLD int = 72008
 )
@@ -110,7 +111,7 @@ var RICAlarmDefinitions map[int]*AlarmDefinition
 var RICPerfAlarmObjects map[int]*Alarm
 
 var (
-       namespace = os.Getenv("PLT_NAMESPACE")
-       ALARM_MANAGER_HTTP_URL string = fmt.Sprintf("http://service-%s-alarmmanager-http.%s:8080", namespace, namespace) 
+       namespace                     = os.Getenv("PLT_NAMESPACE")
+       ALARM_MANAGER_HTTP_URL string = fmt.Sprintf("http://service-%s-alarmmanager-http.%s:8080", namespace, namespace)
        ALARM_MANAGER_RMR_URL  string = fmt.Sprintf("service-%s-alarmmanager-rmr.%s:4560", namespace, namespace)
 )