Skip to content

Commit

Permalink
Release 7.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
al1img authored Jul 1, 2024
2 parents 6fc87d7 + 0438da9 commit e8bb31b
Show file tree
Hide file tree
Showing 96 changed files with 361 additions and 361 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Aos Communication Manager

[![CI](https://github.com/aoscloud/aos_communicationmanager/workflows/CI/badge.svg)](https://github.com/aoscloud/aos_communicationmanager/actions?query=workflow%3ACI)
[![codecov](https://codecov.io/gh/aoscloud/aos_communicationmanager/branch/main/graph/badge.svg?token=oTxsU7fc1y)](https://codecov.io/gh/aoscloud/aos_communicationmanager)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=aoscloud_aos_communicationmanager&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=aoscloud_aos_communicationmanager)
[![CI](https://github.com/aosedge/aos_communicationmanager/workflows/CI/badge.svg)](https://github.com/aosedge/aos_communicationmanager/actions?query=workflow%3ACI)
[![codecov](https://codecov.io/gh/aosedge/aos_communicationmanager/branch/main/graph/badge.svg?token=oTxsU7fc1y)](https://codecov.io/gh/aosedge/aos_communicationmanager)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=aosedge_aos_communicationmanager&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=aosedge_aos_communicationmanager)

Aos Communication Manager (CM) is a part of Aos system which responsible for the following tasks:

Expand All @@ -11,7 +11,7 @@ Aos Communication Manager (CM) is a part of Aos system which responsible for the
* monitor system resource usage;
* serve Update Managers (UM's) and Service Managers (SM's).

See architecture [document](https://docs.aoscloud.io/bin/view/Home/Architecture/Aos%20Core/Communication%20Manager%20%28CM%29/) for more details.
See architecture [document](https://docs.aosedge.io/bin/view/Home/Architecture/Aos%20Core/Communication%20Manager%20%28CM%29/) for more details.

## Build

Expand Down Expand Up @@ -52,7 +52,7 @@ CM is configured through a configuration file. The file `aos_communicationmanage
./aos_communicationmanager -c aos_communicationmanager.cfg
```

The configuration file has JSON format described [here](https://docs.aoscloud.io/bin/view/Home/Architecture/General/Data%20formats/Core%20component%20configurations/Communication%20Manager%20configuration/). Example configuration file could be found in `aos_communication.cfg`
The configuration file has JSON format described [here](https://docs.aosedge.io/bin/view/Home/Architecture/General/Data%20formats/Core%20component%20configurations/Communication%20Manager%20configuration/). Example configuration file could be found in `aos_communication.cfg`

To increase log level use option -v:

Expand All @@ -64,7 +64,7 @@ To increase log level use option -v:

## Required packages

CM needs Aos Identity and Access Manager (IAM) to be running and configured (see aos_iamanager [readme](https://github.com/aoscloud/aos_iamanager/blob/main/README.md)) before start.
CM needs Aos Identity and Access Manager (IAM) to be running and configured (see aos_iamanager [readme](https://github.com/aosedge/aos_iamanager/blob/main/README.md)) before start.

## Test required packages

Expand Down
8 changes: 4 additions & 4 deletions alerts/alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"sync"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/amqphandler"
"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/amqphandler"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
10 changes: 5 additions & 5 deletions alerts/alerts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/api/cloudprotocol"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/alerts"
"github.com/aoscloud/aos_communicationmanager/amqphandler"
"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/alerts"
"github.com/aosedge/aos_communicationmanager/amqphandler"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions amqphandler/amqphandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"sync"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
log "github.com/sirupsen/logrus"
"github.com/streadway/amqp"
)
Expand Down
8 changes: 4 additions & 4 deletions amqphandler/amqphandler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
log "github.com/sirupsen/logrus"
"github.com/streadway/amqp"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_communicationmanager/amqphandler"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_communicationmanager/amqphandler"
)

/***********************************************************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions aos_communicationmanager.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Pkcs11Library": "/usr/lib/softhsm/libsofthsm2.so"
},
"certStorage": "/var/aos/crypt/cm/",
"serviceDiscoveryUrl": "https://aoscloud.io:9000",
"serviceDiscoveryUrl": "https://aosedge.io:9000",
"iamProtectedServerUrl": "aosiam:8089",
"iamPublicServerUrl": "aosiam:8090",
"cmServerUrl": ":8095"
Expand All @@ -28,4 +28,4 @@
"migrationPath": "/usr/share/communicationmanager/migration",
"mergedMigrationPath": "/var/aos/communicationmanager/migration"
}
}
}
10 changes: 5 additions & 5 deletions cmserver/cmserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ import (
"net"
"sync"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
pb "github.com/aoscloud/aos_common/api/communicationmanager/v2"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
pb "github.com/aosedge/aos_common/api/communicationmanager/v2"
"github.com/aosedge/aos_common/utils/cryptutils"
"github.com/golang/protobuf/ptypes/empty"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/protobuf/types/known/emptypb"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
10 changes: 5 additions & 5 deletions cmserver/cmserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
pb "github.com/aoscloud/aos_common/api/communicationmanager/v2"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
pb "github.com/aosedge/aos_common/api/communicationmanager/v2"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/types/known/emptypb"

"github.com/aoscloud/aos_communicationmanager/cmserver"
"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/cmserver"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
46 changes: 23 additions & 23 deletions communicationmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,34 @@ import (
"syscall"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_common/journalalerts"
"github.com/aoscloud/aos_common/resourcemonitor"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aoscloud/aos_common/utils/retryhelper"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/journalalerts"
"github.com/aosedge/aos_common/resourcemonitor"
"github.com/aosedge/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/utils/retryhelper"
"github.com/coreos/go-systemd/daemon"
"github.com/coreos/go-systemd/journal"
"github.com/google/go-tpm/legacy/tpm2"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/alerts"
amqp "github.com/aoscloud/aos_communicationmanager/amqphandler"
"github.com/aoscloud/aos_communicationmanager/cmserver"
"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aoscloud/aos_communicationmanager/database"
"github.com/aoscloud/aos_communicationmanager/downloader"
"github.com/aoscloud/aos_communicationmanager/fcrypt"
"github.com/aoscloud/aos_communicationmanager/iamclient"
"github.com/aoscloud/aos_communicationmanager/imagemanager"
"github.com/aoscloud/aos_communicationmanager/launcher"
"github.com/aoscloud/aos_communicationmanager/monitorcontroller"
"github.com/aoscloud/aos_communicationmanager/networkmanager"
"github.com/aoscloud/aos_communicationmanager/smcontroller"
"github.com/aoscloud/aos_communicationmanager/storagestate"
"github.com/aoscloud/aos_communicationmanager/umcontroller"
"github.com/aoscloud/aos_communicationmanager/unitconfig"
"github.com/aoscloud/aos_communicationmanager/unitstatushandler"
"github.com/aosedge/aos_communicationmanager/alerts"
amqp "github.com/aosedge/aos_communicationmanager/amqphandler"
"github.com/aosedge/aos_communicationmanager/cmserver"
"github.com/aosedge/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/database"
"github.com/aosedge/aos_communicationmanager/downloader"
"github.com/aosedge/aos_communicationmanager/fcrypt"
"github.com/aosedge/aos_communicationmanager/iamclient"
"github.com/aosedge/aos_communicationmanager/imagemanager"
"github.com/aosedge/aos_communicationmanager/launcher"
"github.com/aosedge/aos_communicationmanager/monitorcontroller"
"github.com/aosedge/aos_communicationmanager/networkmanager"
"github.com/aosedge/aos_communicationmanager/smcontroller"
"github.com/aosedge/aos_communicationmanager/storagestate"
"github.com/aosedge/aos_communicationmanager/umcontroller"
"github.com/aosedge/aos_communicationmanager/unitconfig"
"github.com/aosedge/aos_communicationmanager/unitstatushandler"
)

/***********************************************************************************************************************
Expand Down
8 changes: 4 additions & 4 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"path"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/journalalerts"
"github.com/aoscloud/aos_common/resourcemonitor"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/journalalerts"
"github.com/aosedge/aos_common/resourcemonitor"
)

/***********************************************************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
20 changes: 10 additions & 10 deletions database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import (
"path/filepath"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/migration"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/migration"
_ "github.com/mattn/go-sqlite3" // ignore lint
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aoscloud/aos_communicationmanager/downloader"
"github.com/aoscloud/aos_communicationmanager/imagemanager"
"github.com/aoscloud/aos_communicationmanager/launcher"
"github.com/aoscloud/aos_communicationmanager/networkmanager"
"github.com/aoscloud/aos_communicationmanager/storagestate"
"github.com/aoscloud/aos_communicationmanager/umcontroller"
"github.com/aosedge/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/downloader"
"github.com/aosedge/aos_communicationmanager/imagemanager"
"github.com/aosedge/aos_communicationmanager/launcher"
"github.com/aosedge/aos_communicationmanager/networkmanager"
"github.com/aosedge/aos_communicationmanager/storagestate"
"github.com/aosedge/aos_communicationmanager/umcontroller"
)

/***********************************************************************************************************************
Expand Down
22 changes: 11 additions & 11 deletions database/database_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/aostypes"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_common/migration"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/aostypes"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/migration"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aoscloud/aos_communicationmanager/downloader"
"github.com/aoscloud/aos_communicationmanager/imagemanager"
"github.com/aoscloud/aos_communicationmanager/launcher"
"github.com/aoscloud/aos_communicationmanager/networkmanager"
"github.com/aoscloud/aos_communicationmanager/storagestate"
"github.com/aoscloud/aos_communicationmanager/umcontroller"
"github.com/aosedge/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/downloader"
"github.com/aosedge/aos_communicationmanager/imagemanager"
"github.com/aosedge/aos_communicationmanager/launcher"
"github.com/aosedge/aos_communicationmanager/networkmanager"
"github.com/aosedge/aos_communicationmanager/storagestate"
"github.com/aosedge/aos_communicationmanager/umcontroller"
)

/***********************************************************************************************************************
Expand Down
14 changes: 7 additions & 7 deletions downloader/downloader.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ import (
"time"

"code.cloudfoundry.org/bytefmt"
"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_common/image"
"github.com/aoscloud/aos_common/spaceallocator"
"github.com/aoscloud/aos_common/utils/fs"
"github.com/aoscloud/aos_common/utils/retryhelper"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/image"
"github.com/aosedge/aos_common/spaceallocator"
"github.com/aosedge/aos_common/utils/fs"
"github.com/aosedge/aos_common/utils/retryhelper"
"github.com/cavaliergopher/grab/v3"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/config"
)

/***********************************************************************************************************************
Expand Down
12 changes: 6 additions & 6 deletions downloader/downloader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ import (
"testing"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_common/image"
"github.com/aoscloud/aos_common/spaceallocator"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/image"
"github.com/aosedge/aos_common/spaceallocator"
log "github.com/sirupsen/logrus"

"github.com/aoscloud/aos_communicationmanager/config"
"github.com/aoscloud/aos_communicationmanager/downloader"
"github.com/aosedge/aos_communicationmanager/config"
"github.com/aosedge/aos_communicationmanager/downloader"
)

/***********************************************************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions downloader/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package downloader
import (
"context"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/spaceallocator"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/spaceallocator"
)

/***********************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion fcrypt/cms.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"encoding/asn1"
"math/big"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aosedge/aos_common/aoserrors"
log "github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions fcrypt/fcrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import (
"strings"
"time"

"github.com/aoscloud/aos_common/aoserrors"
"github.com/aoscloud/aos_common/api/cloudprotocol"
"github.com/aoscloud/aos_common/utils/contextreader"
"github.com/aoscloud/aos_common/utils/cryptutils"
"github.com/aosedge/aos_common/aoserrors"
"github.com/aosedge/aos_common/api/cloudprotocol"
"github.com/aosedge/aos_common/utils/contextreader"
"github.com/aosedge/aos_common/utils/cryptutils"
log "github.com/sirupsen/logrus"
)

Expand Down
Loading

0 comments on commit e8bb31b

Please sign in to comment.