sts-sponsors team mailing list archive
-
sts-sponsors team
-
Mailing list archive
-
Message #08326
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
Anton Troyanov has proposed merging ~troyanov/maas:expose-enable_hw_sync into maas:master.
Commit message:
feat(api): expose enable_hw_sync
Expose enable_hw_sync property of machine over API
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/442692
--
Your team MAAS Maintainers is requested to review the proposed merge of ~troyanov/maas:expose-enable_hw_sync into maas:master.
diff --git a/Makefile b/Makefile
index 1652997..dd5e1fe 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ swagger-css: $(swagger-dist)
go-bins:
$(MAKE) -j -C src/host-info build
- $(MAKE) -j -C src/maasagent build
+ $(MAKE) -j -C src/maasagent build OUT_PREFIX=maas-
.PHONY: go-bins
test: test-missing-migrations test-py lint-oapi test-go
diff --git a/src/maasagent/Makefile b/src/maasagent/Makefile
index 96afca0..f58c90e 100644
--- a/src/maasagent/Makefile
+++ b/src/maasagent/Makefile
@@ -21,9 +21,13 @@ ARTIFACTS := $(subst /,,$(subst cmd/,,$(wildcard cmd/*/)))
.PHONY: build
build: vendor
- $(MAKE) $(addprefix $(BUILD_DIR)/,$(ARTIFACTS))
+ $(MAKE) $(addprefix $(BUILD_DIR)/$(OUT_PREFIX),$(ARTIFACTS))
+<<<<<<< src/maasagent/Makefile
$(BUILD_DIR)/%:
+=======
+$(BUILD_DIR)/$(OUT_PREFIX)%:
+>>>>>>> src/maasagent/Makefile
CGO_ENABLED=0 $(GO) build -o $(BUILD_DIR)/$* $(LDFLAGS) cmd/$*/*.go
.PHONY: install
diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index d99a069..e46aa53 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -194,6 +194,7 @@ DISPLAYED_MACHINE_FIELDS = (
"last_sync",
"sync_interval",
"next_sync",
+ "enable_hw_sync",
)
# Limited set of machine fields exposed on the anonymous API.
Follow ups
-
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: MAAS Lander, 2023-05-17
-
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: Anton Troyanov, 2023-05-17
-
Re: [Merge] -b expose-enable_hw_sync lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas - LANDING FAILED
From: MAAS Lander, 2023-05-17
-
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: MAAS Lander, 2023-05-17
-
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: Anton Troyanov, 2023-05-17
-
[Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: Anton Troyanov, 2023-05-17
-
Re: [UNITTESTS] -b expose-enable_hw_sync lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS PASS
From: MAAS Lander, 2023-05-12
-
Re: [UNITTESTS] -b expose-enable_hw_sync lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
From: MAAS Lander, 2023-05-11
-
Re: [Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: Christian Grabowski, 2023-05-11
-
Re: [Merge] ~troyanov/maas:expose-enable_hw_sync into maas:master
From: Anton Troyanov, 2023-05-11
-
Re: [UNITTESTS] -b expose-enable_hw_sync lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas - TESTS FAILED
From: MAAS Lander, 2023-05-11