Merge branch 'development' into odim_7044_updateModels

ODIM-Project · Sep 4, 2023 · e04db4c · e04db4c
2 parents 5912550 + eea977d
commit e04db4c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/odimra_deployment.yml b/.github/workflows/odimra_deployment.yml
@@ -198,16 +198,16 @@ jobs:
 
         echo "==============updating the docker handler========="
         cd ${ODIM_CONTROLLER_PATH}/kubespray
-        tar -xvzf kubespray-2.20.0.tar.gz
-        cd kubespray-2.20.0/roles/container-engine/docker/handlers
+        tar -xvzf kubespray-2.22.1.tar.gz
+        cd kubespray-2.20.1/roles/container-engine/docker/handlers
         sed -i "22,32d" main.yml
         sed -i "7,8d" main.yml
 
         cat main.yml
         cd ${ODIM_CONTROLLER_PATH}/kubespray
-        tar -cvzf kubespray-2.20.0.tar.gz kubespray-2.20.0
+        tar -cvzf kubespray-2.22.1.tar.gz kubespray-2.22.1
 
-        rm -rf kubespray-2.20.0
+        rm -rf kubespray-2.22.1
 
         ls
 

diff --git a/lib-dmtf/model/resourceCollection.go b/lib-dmtf/model/resourceCollection.go
@@ -16,16 +16,16 @@ package model
 
 // Collection is the redfish resource collection  model according to the 2020.3 release
 type Collection struct {
-	ODataContext          string                 `json:"@odata.context,omitempty"`
-	ODataEtag             string                 `json:"@odata.etag,omitempty"`
-	ODataID               string                 `json:"@odata.id"`
-	ODataType             string                 `json:"@odata.type"`
-	Description           string                 `json:"Description,omitempty"`
-	Name                  string                 `json:"Name"`
-	Members               []*Link                `json:"Members"`
-	MembersCount          int                    `json:"Members@odata.count"`
-	MemberNavigationLink  string                 `json:"Members@odata.navigationLink,omitempty"`
-	Oem                   interface{}            `json:"Oem,omitempty"`
-	MembersNextLink       string                 `json:"Members@odata.nextLink,omitempty"`
-	CollectionCapabilitie CollectionCapabilities `json:"@Redfish.CollectionCapabilities,omitempty"`
+	ODataContext          string                  `json:"@odata.context,omitempty"`
+	ODataEtag             string                  `json:"@odata.etag,omitempty"`
+	ODataID               string                  `json:"@odata.id"`
+	ODataType             string                  `json:"@odata.type"`
+	Description           string                  `json:"Description,omitempty"`
+	Name                  string                  `json:"Name"`
+	Members               []*Link                 `json:"Members"`
+	MembersCount          int                     `json:"Members@odata.count"`
+	MemberNavigationLink  string                  `json:"Members@odata.navigationLink,omitempty"`
+	Oem                   interface{}             `json:"Oem,omitempty"`
+	MembersNextLink       string                  `json:"Members@odata.nextLink,omitempty"`
+	CollectionCapabilitie *CollectionCapabilities `json:"@Redfish.CollectionCapabilities,omitempty"`
 }
diff --git a/odim-controller/kubespray/kubespray-2.20.0.tar.gz b/odim-controller/kubespray/kubespray-2.20.0.tar.gz
diff --git a/odim-controller/kubespray/kubespray-2.22.1.tar.gz b/odim-controller/kubespray/kubespray-2.22.1.tar.gz