Added Core snapshot script, update to latest proto

Signed-off-by: Tareque Hossain <thossain@nvidia.com>

Author: thossain-nv

Makefile

@@ -218,17 +218,25 @@ docker-build:
 	docker build -t $(IMAGE_REGISTRY)/carbide-psm:$(IMAGE_TAG) -f $(DOCKERFILE_DIR)/Dockerfile.carbide-psm .
 	docker build -t $(IMAGE_REGISTRY)/carbide-nsm:$(IMAGE_TAG) -f $(DOCKERFILE_DIR)/Dockerfile.carbide-nsm .
 
-core-proto:
-	if [ -d "nico-core" ]; then cd nico-core && git pull; else git clone ssh://git@github.com/NVIDIA/ncx-infra-controller-core.git nico-core; fi
+core-proto: core-proto-clean core-proto-fetch core-proto-fmt core-protogen
+
+core-proto-clean:
+	@echo "Cleaning up Core proto and protobuf files"
+	rm -rf workflow-schema/site-agent/workflows/v1/*_carbide.proto
+	rm -rf workflow-schema/schema/site-agent/workflows/v1/*.pb.go
+
+core-proto-fetch:
+	if [ -d "nico-core" ]; then cd nico-core && git fetch origin && git reset --hard origin/main; else git clone ssh://git@github.com/NVIDIA/ncx-infra-controller-core.git nico-core; fi
 	ls nico-core/crates/rpc/proto
 	@for file in nico-core/crates/rpc/proto/*.proto; do \
 		cp "$$file" "workflow-schema/site-agent/workflows/v1/$$(basename "$$file" .proto)_carbide.proto"; \
 		echo "Copied: $$file"; \
 	done
+	echo "Successfully copied Core protobuf files"
 	rm -rf nico-core
-	echo "Successfully copied Core protobuf files. However, updating Core proto is a complex process and requires manual editing of copied files. Check for WARNING statements in the diff."
 
 core-proto-fmt:
+	@echo "Formatting Core protobuf files"
 	cd workflow-schema/scripts && go run core-proto-fmt.go
 
 core-protogen:

api/pkg/api/handler/expectedpowershelf.go

@@ -207,7 +207,7 @@ func (cepsh CreateExpectedPowerShelfHandler) Handle(c echo.Context) error {
 	}
 
 	if expectedPowerShelf.IpAddress != nil {
-		createExpectedPowerShelfRequest.IpAddress = *expectedPowerShelf.IpAddress
+		createExpectedPowerShelfRequest.BmcIpAddress = *expectedPowerShelf.IpAddress
 	}
 
 	if expectedPowerShelf.RackID != nil {
@@ -725,7 +725,7 @@ func (uepsh UpdateExpectedPowerShelfHandler) Handle(c echo.Context) error {
 	}
 
 	if updatedExpectedPowerShelf.IpAddress != nil {
-		updateExpectedPowerShelfRequest.IpAddress = *updatedExpectedPowerShelf.IpAddress
+		updateExpectedPowerShelfRequest.BmcIpAddress = *updatedExpectedPowerShelf.IpAddress
 	}
 
 	if updatedExpectedPowerShelf.RackID != nil {

site-workflow/pkg/activity/expectedpowershelf.go

@@ -423,8 +423,8 @@ func expectedPowerShelfToRLAComponent(eps *cwssaws.ExpectedPowerShelf) *rlav1.Co
 		component.Position = pos
 	}
 
-	if eps.GetIpAddress() != "" {
-		ipAddr := eps.GetIpAddress()
+	if eps.GetBmcIpAddress() != "" {
+		ipAddr := eps.GetBmcIpAddress()
 		component.Bmcs[0].IpAddress = &ipAddr
 	}
 

site-workflow/pkg/activity/expectedpowershelf_test.go

@@ -485,7 +485,7 @@ func Test_expectedPowerShelfToRLAComponent(t *testing.T) {
 			ExpectedPowerShelfId: &cwssaws.UUID{Value: "eps-001"},
 			BmcMacAddress:        "AA:BB:CC:DD:EE:FF",
 			ShelfSerialNumber:    "SHELF-001",
-			IpAddress:            "10.0.0.1",
+			BmcIpAddress:         "10.0.0.1",
 			RackId:               &cwssaws.RackId{Id: "rack-001"},
 			Name:                 strPtr("pdu-shelf-1"),
 			Manufacturer:         strPtr("Vertiv"),