Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove TargetInfo entity #453

Merged
merged 12 commits into from
Mar 17, 2017
Merged

Remove TargetInfo entity #453

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b547c65
PoC for controller aware.
kaizimmerm Dec 23, 2016
c1ca8c5
Merge branch 'master' into feature_auditor_controller_aware
kaizimmerm Feb 23, 2017
6ea8f0c
Added test for plug and play create
kaizimmerm Feb 23, 2017
c577fc8
Started deletion targetinfo.
kaizimmerm Feb 23, 2017
77b35c1
Remove target info
kaizimmerm Feb 24, 2017
d341d2c
Completed targetinfo removal.
kaizimmerm Mar 2, 2017
373944c
Merge branch 'master' into feature_auditor_controller_aware
kaizimmerm Mar 3, 2017
21ef1a8
Fix sonar issues
kaizimmerm Mar 3, 2017
6e41ac8
Fix import
kaizimmerm Mar 3, 2017
a09509d
Merge branch 'master' into feature_auditor_controller_aware
kaizimmerm Mar 17, 2017
c7b759e
Readedability improved, sonar issues fixed.
kaizimmerm Mar 17, 2017
56eb049
Switch to anymatch.
kaizimmerm Mar 17, 2017
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
12 changes: 6 additions & 6 deletions hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ public enum TargetFields implements FieldNameProvider {
/**
* The updateStatus field.
*/
UPDATESTATUS("targetInfo.updateStatus"),
UPDATESTATUS("updateStatus"),

/**
* The ip-address field.
*/
IPADDRESS("targetInfo.address"),
IPADDRESS("address"),

/**
* The attribute map of target info.
*/
ATTRIBUTE("targetInfo.controllerAttributes", true),
ATTRIBUTE("controllerAttributes", true),

/**
* distribution sets which is assigned to the target.
Expand All @@ -67,17 +67,17 @@ public enum TargetFields implements FieldNameProvider {
/**
* distribution sets which is installed on the target.
*/
INSTALLEDDS("targetInfo.installedDistributionSet", "name", "version"),
INSTALLEDDS("installedDistributionSet", "name", "version"),

/**
* The tags field.
*/
TAG("tags.name"),

/**
* Last time the target or DMF client polled.
* Last time the DDI or DMF client polled.
*/
LASTCONTROLLERREQUESTAT("targetInfo.lastTargetQuery");
LASTCONTROLLERREQUESTAT("lastTargetQuery");

private final String fieldName;
private List<String> subEntityAttribues;
Expand Down
2 changes: 1 addition & 1 deletion ...di-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static DdiControllerBase fromTarget(final Target target, final Action action,
}
}

if (target.getTargetInfo().isRequestControllerAttributes()) {
if (target.isRequestControllerAttributes()) {
result.add(linkTo(methodOn(DdiRootController.class, tenantAware.getCurrentTenant()).putConfigData(null,
tenantAware.getCurrentTenant(), target.getControllerId()))
.withRel(DdiRestConstants.CONFIG_DATA_ACTION));
Expand Down
44 changes: 22 additions & 22 deletions ...ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ public void rootRsCancelActionButContinueAnyway() throws Exception {
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());

// check database after test
assertThat(deploymentManagement.getAssignedDistributionSet(TestdataFactory.DEFAULT_CONTROLLER_ID).get())
.isEqualTo(ds);
assertThat(deploymentManagement.getInstalledDistributionSet(TestdataFactory.DEFAULT_CONTROLLER_ID).get())
.isEqualTo(ds);
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getAssignedDistributionSet().getId()).isEqualTo(ds.getId());
assertThat(targetManagement.findTargetByControllerIDWithDetails(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getInstalledDistributionSet().getId()).isEqualTo(ds.getId());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getInstallationDate()).isGreaterThanOrEqualTo(current);
.getInstallationDate()).isGreaterThanOrEqualTo(current);

}

Expand All @@ -119,9 +119,9 @@ public void rootRsCancelAction() throws Exception {
// often too fast and
// the following assert will fail
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
.getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);

// Retrieved is reported

Expand Down Expand Up @@ -151,23 +151,23 @@ public void rootRsCancelAction() throws Exception {
// often too fast and
// the following assert will fail
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
.getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);

current = System.currentTimeMillis();
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
.getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
mvc.perform(get("/{tenant}/controller/v1/" + TestdataFactory.DEFAULT_CONTROLLER_ID + "/cancelAction/"
+ cancelAction.getId(), tenantAware.getCurrentTenant()).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$.id", equalTo(String.valueOf(cancelAction.getId()))))
.andExpect(jsonPath("$.cancelAction.stopId", equalTo(String.valueOf(updateAction.getId()))));
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
.getLastTargetQuery()).isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);

// controller confirmed cancelled action, should not be active anymore
mvc.perform(post("/{tenant}/controller/v1/" + TestdataFactory.DEFAULT_CONTROLLER_ID + "/cancelAction/"
Expand Down Expand Up @@ -251,7 +251,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);

assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(3);
Expand All @@ -263,7 +263,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(4);

Expand All @@ -274,7 +274,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(5);
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);

Expand All @@ -287,7 +287,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(6);
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);

Expand All @@ -303,7 +303,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(7);
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);

Expand All @@ -315,7 +315,7 @@ public void rootRsCancelActionFeedback() throws Exception {
.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getTargetInfo().getLastTargetQuery()).isGreaterThanOrEqualTo(current);
.getLastTargetQuery()).isGreaterThanOrEqualTo(current);
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(8);
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(0);
}
Expand Down Expand Up @@ -403,8 +403,8 @@ public void multipleCancelActionFeedback() throws Exception {
.andDo(MockMvcResultPrinter.print()).andExpect(status().isOk());
assertThat(deploymentManagement.countActionStatusAll()).isEqualTo(9);

assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getAssignedDistributionSet()).isEqualTo(ds3);
assertThat(deploymentManagement.getAssignedDistributionSet(TestdataFactory.DEFAULT_CONTROLLER_ID).get())
.isEqualTo(ds3);
mvc.perform(get("/{tenant}/controller/v1/" + TestdataFactory.DEFAULT_CONTROLLER_ID + "/deploymentBase/"
+ updateAction3.getId(), tenantAware.getCurrentTenant())).andDo(MockMvcResultPrinter.print())
.andExpect(status().isOk());
Expand All @@ -418,8 +418,8 @@ public void multipleCancelActionFeedback() throws Exception {
// action is in cancelling state
assertThat(deploymentManagement.findActiveActionsByTarget(savedTarget.getControllerId())).hasSize(1);
assertThat(deploymentManagement.countActionsByTarget(savedTarget.getControllerId())).isEqualTo(3);
assertThat(targetManagement.findTargetByControllerID(TestdataFactory.DEFAULT_CONTROLLER_ID).get()
.getAssignedDistributionSet()).isEqualTo(ds3);
assertThat(deploymentManagement.getAssignedDistributionSet(TestdataFactory.DEFAULT_CONTROLLER_ID).get())
.isEqualTo(ds3);

mvc.perform(get("/{tenant}/controller/v1/" + TestdataFactory.DEFAULT_CONTROLLER_ID + "/cancelAction/"
+ cancelAction3.getId(), tenantAware.getCurrentTenant()).accept(MediaType.APPLICATION_JSON))
Expand Down
29 changes: 15 additions & 14 deletions ...t-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import org.springframework.http.MediaType;
import org.springframework.test.context.ActiveProfiles;

import com.google.common.collect.Maps;

import ru.yandex.qatools.allure.annotations.Description;
import ru.yandex.qatools.allure.annotations.Features;
import ru.yandex.qatools.allure.annotations.Stories;
Expand Down Expand Up @@ -58,19 +60,20 @@ public void requestConfigDataIfEmpty() throws Exception {
Thread.sleep(1); // is required: otherwise processing the next line is
// often too fast and
// the following assert will fail
assertThat(targetManagement.findTargetByControllerID("4712").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4712").get().getLastTargetQuery())
.isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID("4712").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4712").get().getLastTargetQuery())
.isGreaterThanOrEqualTo(current);

savedTarget.getTargetInfo().getControllerAttributes().put("dsafsdf", "sdsds");
final Map<String, String> attributes = Maps.newHashMapWithExpectedSize(1);
attributes.put("dsafsdf", "sdsds");

final Target updateControllerAttributes = controllerManagement.updateControllerAttributes(
savedTarget.getControllerId(), savedTarget.getTargetInfo().getControllerAttributes());
final Target updateControllerAttributes = controllerManagement
.updateControllerAttributes(savedTarget.getControllerId(), attributes);
// request controller attributes need to be false because we don't want
// to request the
// controller attributes again
assertThat(updateControllerAttributes.getTargetInfo().isRequestControllerAttributes()).isFalse();
assertThat(updateControllerAttributes.isRequestControllerAttributes()).isFalse();

mvc.perform(
get("/{tenant}/controller/v1/4712", tenantAware.getCurrentTenant()).accept(APPLICATION_JSON_HAL_UTF))
Expand All @@ -97,12 +100,11 @@ public void putConfigData() throws Exception {
Thread.sleep(1); // is required: otherwise processing the next line is
// often too fast and
// the following assert will fail
assertThat(targetManagement.findTargetByControllerID("4717").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4717").get().getLastTargetQuery())
.isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID("4717").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4717").get().getLastTargetQuery())
.isGreaterThanOrEqualTo(current);
assertThat(targetManagement.findTargetByControllerIDWithDetails("4717").get().getTargetInfo()
.getControllerAttributes()).isEqualTo(attributes);
assertThat(targetManagement.getControllerAttributes("4717")).isEqualTo(attributes);

// update
attributes.put("sdsds", "123412");
Expand All @@ -113,12 +115,11 @@ public void putConfigData() throws Exception {
Thread.sleep(1); // is required: otherwise processing the next line is
// often too fast and
// the following assert will fail
assertThat(targetManagement.findTargetByControllerID("4717").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4717").get().getLastTargetQuery())
.isLessThanOrEqualTo(System.currentTimeMillis());
assertThat(targetManagement.findTargetByControllerID("4717").get().getTargetInfo().getLastTargetQuery())
assertThat(targetManagement.findTargetByControllerID("4717").get().getLastTargetQuery())
.isGreaterThanOrEqualTo(current);
assertThat(targetManagement.findTargetByControllerIDWithDetails("4717").get().getTargetInfo()
.getControllerAttributes()).isEqualTo(attributes);
assertThat(targetManagement.getControllerAttributes("4717")).isEqualTo(attributes);
}

@Test
Expand Down
Loading