Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,19 @@ sudo make compose-up
- Default log file path
- ./cm-damselfly/cmd/cm-damselfly/log/damselfly.log

### Versions of packages applied to the released Damselfly

| cm-damselfly | cm-model<BR>(OnpremInfraModel<BR>/SoftwareModel) | cb-tumblebug<BR>(CloudInfraModel) |
|--------|--------|--------|
| v0.2.0 | v0.0.3 | v0.9.16 |
| v0.2.1 | v0.0.3 | v0.10.0 |
| v0.2.2 | v0.0.3 | v0.10.0 |
| v0.3.0 | v0.0.3 | v0.10.3 |
| v0.3.1 | v0.0.10 | v0.11.2 |
| v0.3.2 | v0.0.10 | v0.11.2 |
| v0.3.3 | v0.0.11 | v0.11.3 |
| v0.3.4 | v0.0.12 | v0.11.3 |
| v0.3.5 | v0.0.13 | v0.11.9 |
### Versions of models applied to the released Damselfly
| **cm-damselfly** | **cm-model<BR>(OnpremInfraModel/CloudInfraModel/SoftwareModel)** |
| :----: | :-----: |
| v0.2.0 | v0.0.3 |
| v0.2.1 | v0.0.3 |
| v0.2.2 | v0.0.3 |
| v0.3.0 | v0.0.3 |
| v0.3.1 | v0.0.10 |
| v0.3.2 | v0.0.10 |
| v0.3.3 | v0.0.11 |
| v0.3.4 | v0.0.12 |
| v0.3.5 | v0.0.13 |
| v0.3.6 | v0.0.14 |

### CM-Damselfly REST API user guide
- Discussion link : [How to use and test CM-Damselfly APIs (with test examples)](https://github.com/cloud-barista/cm-damselfly/discussions/25)
4 changes: 2 additions & 2 deletions cmd/cm-damselfly/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cloud-barista/cm-damselfly
go 1.23.0

require (
github.com/cloud-barista/cm-model v0.0.13
github.com/cloud-barista/cm-model v0.0.14
github.com/labstack/echo/v4 v4.13.3
github.com/rs/zerolog v1.33.0
github.com/spf13/viper v1.19.0
Expand All @@ -14,7 +14,7 @@ require (

require (
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/cloud-barista/cb-tumblebug v0.11.9 // indirect
github.com/cloud-barista/cb-tumblebug v0.11.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions cmd/cm-damselfly/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ github.com/cloud-barista/cb-tumblebug v0.11.3 h1:Bd8vsyPOBBfv/N+jZHpLPiEKpHX+UO+
github.com/cloud-barista/cb-tumblebug v0.11.3/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cb-tumblebug v0.11.9 h1:GgJZAk/cvrZZr8x6heKkCGD/QgNUBKpJRUsWtY5xXlo=
github.com/cloud-barista/cb-tumblebug v0.11.9/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cb-tumblebug v0.11.13 h1:KgNDnMiuBR9bo2VZbMasnUzrKIP/A/2CrhDG4cp+bWo=
github.com/cloud-barista/cb-tumblebug v0.11.13/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cm-model v0.0.10 h1:vGaYam3/VX8IvagHdtWx10ZgH36xZ+44Db2ZG/uSvA4=
github.com/cloud-barista/cm-model v0.0.10/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.12-0.20250823152636-94d1ad552aa3 h1:n8ZjJxg9p7t6vrB1k1SQn+VARC/lDim+upUzI6saV7M=
Expand All @@ -16,6 +18,8 @@ github.com/cloud-barista/cm-model v0.0.12 h1:98+LJqDf/yBUkwd8fkkDGp20x6CtF064aC9
github.com/cloud-barista/cm-model v0.0.12/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.13 h1:SOuFyTcszHAFpaojYcuSYMOXkjSRfQPqwlVsB8RvmgE=
github.com/cloud-barista/cm-model v0.0.13/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.14 h1:WkfBZHRuzQmCxbvDNeuy+TQJQjZtjbLQ9gWB8XFffm0=
github.com/cloud-barista/cm-model v0.0.14/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
cm-damselfly:
image: cloudbaristaorg/cm-damselfly:0.3.5
image: cloudbaristaorg/cm-damselfly:0.3.6
container_name: cm-damselfly
pull_policy: missing
restart: always
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/cloud-barista/cm-damselfly
go 1.23.0

require (
github.com/cloud-barista/cm-model v0.0.13
github.com/cloud-barista/cm-model v0.0.14
github.com/labstack/echo/v4 v4.13.3
github.com/rs/zerolog v1.33.0
github.com/spf13/viper v1.19.0
Expand All @@ -14,7 +14,7 @@ require (

require (
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/cloud-barista/cb-tumblebug v0.11.9 // indirect
github.com/cloud-barista/cb-tumblebug v0.11.13 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ github.com/cloud-barista/cb-tumblebug v0.11.3 h1:Bd8vsyPOBBfv/N+jZHpLPiEKpHX+UO+
github.com/cloud-barista/cb-tumblebug v0.11.3/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cb-tumblebug v0.11.9 h1:GgJZAk/cvrZZr8x6heKkCGD/QgNUBKpJRUsWtY5xXlo=
github.com/cloud-barista/cb-tumblebug v0.11.9/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cb-tumblebug v0.11.13 h1:KgNDnMiuBR9bo2VZbMasnUzrKIP/A/2CrhDG4cp+bWo=
github.com/cloud-barista/cb-tumblebug v0.11.13/go.mod h1:rNsvfQxOyAhC4ZEeBb/zfajrFXU70D10wLTcRPiRhf0=
github.com/cloud-barista/cm-model v0.0.10 h1:vGaYam3/VX8IvagHdtWx10ZgH36xZ+44Db2ZG/uSvA4=
github.com/cloud-barista/cm-model v0.0.10/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.12-0.20250823152636-94d1ad552aa3 h1:n8ZjJxg9p7t6vrB1k1SQn+VARC/lDim+upUzI6saV7M=
Expand All @@ -16,6 +18,8 @@ github.com/cloud-barista/cm-model v0.0.12 h1:98+LJqDf/yBUkwd8fkkDGp20x6CtF064aC9
github.com/cloud-barista/cm-model v0.0.12/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.13 h1:SOuFyTcszHAFpaojYcuSYMOXkjSRfQPqwlVsB8RvmgE=
github.com/cloud-barista/cm-model v0.0.13/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/cloud-barista/cm-model v0.0.14 h1:WkfBZHRuzQmCxbvDNeuy+TQJQjZtjbLQ9gWB8XFffm0=
github.com/cloud-barista/cm-model v0.0.14/go.mod h1:gSuMhQxD813KIdSvkp8uGptYOeyDik749sYcICZjhj8=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
12 changes: 6 additions & 6 deletions pkg/api/rest/handler/cloud-user-model.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func GetOnPremModel(c echo.Context) error {
return c.JSON(http.StatusBadRequest, res)
}
} else {
newErr := fmt.Errorf("'isCloudModel' does not exist")
newErr := fmt.Errorf("'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model.")
log.Warn().Msg(newErr.Error())
res := model.Response{
Success: false,
Expand Down Expand Up @@ -644,7 +644,7 @@ func UpdateOnPremModel(c echo.Context) error {
return c.JSON(http.StatusNotFound, newErr)
}
} else {
msg := "'isCloudModel' does not exist"
msg := "'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model."
log.Error().Msg(msg)
newErr := errors.New(msg)
return c.JSON(http.StatusNotFound, newErr)
Expand Down Expand Up @@ -805,7 +805,7 @@ func DeleteOnPremModel(c echo.Context) error {
return c.JSON(http.StatusNotFound, newErr)
}
} else {
msg := "'isCloudModel' does not exist"
msg := "'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model."
log.Error().Msg(msg)
newErr := errors.New(msg)
return c.JSON(http.StatusNotFound, newErr)
Expand Down Expand Up @@ -960,7 +960,7 @@ func GetCloudModel(c echo.Context) error {
return c.JSON(http.StatusNotFound, newErr)
}
} else {
msg := "'isCloudModel' does not exist"
msg := "'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model."
log.Error().Msg(msg)
newErr := errors.New(msg)
return c.JSON(http.StatusNotFound, newErr)
Expand Down Expand Up @@ -1153,7 +1153,7 @@ func UpdateCloudModel(c echo.Context) error {

}
} else {
msg := "'isCloudModel' does not exist"
msg := "'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model."
log.Error().Msg(msg)
newErr := errors.New(msg)
return c.JSON(http.StatusNotFound, newErr)
Expand Down Expand Up @@ -1297,7 +1297,7 @@ func DeleteCloudModel(c echo.Context) error {
return c.JSON(http.StatusNotFound, newErr)
}
} else {
msg := "'isCloudModel' does not exist"
msg := "'isCloudModel' does not exist. This is neither on-premise user model nor cloud user model."
log.Error().Msg(msg)
newErr := errors.New(msg)
return c.JSON(http.StatusNotFound, newErr)
Expand Down