diff --git a/helper/test_data.go b/helper/test_data.go index 7f7f918..6140e64 100644 --- a/helper/test_data.go +++ b/helper/test_data.go @@ -96,32 +96,30 @@ var propertiesA = json.RawMessage(`{"prop1" : "a nice prop"}`) var propertiesB = json.RawMessage(`{"prop1" : "not so nice"}`) var ICA = database.InfrastructureComponent{ - UUID: "7be0322d-354e-431e-84bd-ae4c9633138b", - WebsocketURL: "https://villas.k8s.eonerc.rwth-aachen.de/ws/ws_sig", - APIURL: "https://villas.k8s.eonerc.rwth-aachen.de/ws/api/v2", - Type: "villas-node", - Category: "gateway", - Name: "ACS Demo Signals", - Uptime: -1.0, - State: "idle", - Location: "k8s", - Description: "A signal generator for testing purposes", - //StateUpdateAt: time.Now().Format(time.RFC1123), + UUID: "7be0322d-354e-431e-84bd-ae4c9633138b", + WebsocketURL: "https://villas.k8s.eonerc.rwth-aachen.de/ws/ws_sig", + APIURL: "https://villas.k8s.eonerc.rwth-aachen.de/ws/api/v2", + Type: "villas-node", + Category: "gateway", + Name: "ACS Demo Signals", + Uptime: -1.0, + State: "idle", + Location: "k8s", + Description: "A signal generator for testing purposes", StartParameterScheme: postgres.Jsonb{propertiesA}, ManagedExternally: false, } var ICB = database.InfrastructureComponent{ - UUID: "4854af30-325f-44a5-ad59-b67b2597de68", - WebsocketURL: "xxx.yyy.zzz.aaa", - Type: "dpsim", - Category: "simulator", - Name: "Test DPsim Simulator", - Uptime: -1.0, - State: "running", - Location: "ACS Laboratory", - Description: "This is a test description", - //StateUpdateAt: time.Now().Format(time.RFC1123), + UUID: "4854af30-325f-44a5-ad59-b67b2597de68", + WebsocketURL: "xxx.yyy.zzz.aaa", + Type: "dpsim", + Category: "simulator", + Name: "Test DPsim Simulator", + Uptime: -1.0, + State: "running", + Location: "ACS Laboratory", + Description: "This is a test description", StartParameterScheme: postgres.Jsonb{propertiesB}, ManagedExternally: true, } diff --git a/routes/infrastructure-component/ic_validators.go b/routes/infrastructure-component/ic_validators.go index e1ee924..44f9840 100644 --- a/routes/infrastructure-component/ic_validators.go +++ b/routes/infrastructure-component/ic_validators.go @@ -143,7 +143,7 @@ func (r *AddICRequest) createIC(receivedViaAMQP bool) (InfrastructureComponent, s.State = "unknown" } // set last update to creation time of IC - s.StateUpdateAt = time.Now().Format(time.RFC1123) + s.StateUpdateAt = time.Now().Format(time.RFC1123Z) return s, err } @@ -175,7 +175,7 @@ func (r *UpdateICRequest) updatedIC(oldIC InfrastructureComponent) Infrastructur s.Description = r.InfrastructureComponent.Description // set last update time - s.StateUpdateAt = time.Now().Format(time.RFC1123) + s.StateUpdateAt = time.Now().Format(time.RFC1123Z) // only update props if not empty var emptyJson postgres.Jsonb