feat(rest.network.configuration.provider): new rest api for network configuration management #4915

sfiorani · 2023-10-25T13:53:28Z

This PR add a new REST api for managing network configuraion.

Related Issue:

Description of the solution adopted:

Screenshots:

Manual Tests:

Any side note on the changes made:

nicolatimeus · 2023-10-27T14:27:55Z

...va/org/eclipse/kura/internal/rest/network/configuration/NetworkConfigurationRestService.java

+
+    private static final Logger logger = LoggerFactory.getLogger(NetworkConfigurationRestService.class);
+
+    private static final String APP_ID = "NETCONF-V1";


No need to expose this as a request handler, please remove this.

nicolatimeus · 2023-10-27T14:28:06Z

...va/org/eclipse/kura/internal/rest/network/configuration/NetworkConfigurationRestService.java

+
+    private static final String SNAPSHOT_SUBTASK_ID = "snapshot";
+
+    private final RequestHandler requestHandler = new JaxRsRequestHandlerProxy(this);


No need to expose this as a request handler, please remove this.

nicolatimeus · 2023-10-27T14:28:14Z

...va/org/eclipse/kura/internal/rest/network/configuration/NetworkConfigurationRestService.java

+        this.cryptoService = cryptoService;
+    }
+
+    public void setRequestHandlerRegistry(final RequestHandlerRegistry registry) {


No need to expose this as a request handler, please remove this.

nicolatimeus · 2023-10-27T14:28:19Z

...va/org/eclipse/kura/internal/rest/network/configuration/NetworkConfigurationRestService.java

+        }
+    }
+
+    public void unsetRequestHandlerRegistry(final RequestHandlerRegistry registry) {


No need to expose this as a request handler, please remove this.

nicolatimeus · 2023-10-27T14:31:00Z

...pse.kura.rest.network.configuration.provider/OSGI-INF/network_configuration_rest_service.xml

+	<reference bind="setUserAdmin" cardinality="0..1"
+		interface="org.osgi.service.useradmin.UserAdmin" name="UserAdmin"
+		policy="static" />
+	<reference bind="setRequestHandlerRegistry" cardinality="0..n"


No need to expose this as a request handler, please remove this.

nicolatimeus · 2023-10-27T14:32:33Z

...va/org/eclipse/kura/internal/rest/network/configuration/NetworkConfigurationRestService.java

+     */
+    @GET
+    @RolesAllowed("network.configuration")
+    @Path("/networkConfigurableComponents")


Maybe you can replace networkConfigurableComponents with configurableComponents to be consistent with CONF-V2, we already have networkConfiguration in the prefix

nicolatimeus · 2023-10-30T09:30:16Z

https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/11344

sfiorani · 2023-10-30T10:10:47Z

Tested on Raspberry Pi with generic-aarch64 kura profile

nicolatimeus · 2023-10-31T15:06:44Z

There are conflicts that need to be solved

nicolatimeus · 2023-10-31T15:07:44Z

kura/org.eclipse.kura.rest.network.configuration.provider/build.properties

@@ -0,0 +1,19 @@
+#
+#  Copyright (c) 2021 Eurotech and/or its affiliates and others


Set to 2023

nicolatimeus · 2023-10-31T15:08:13Z

kura/test/org.eclipse.kura.rest.network.configuration.provider.test/build.properties

@@ -0,0 +1,15 @@
+#
+#  Copyright (c) 2021 Eurotech and/or its affiliates and others


nicolatimeus · 2023-10-31T15:08:50Z

...ipse/kura/rest/network/configuration/provider/test/responses/MockComponentConfiguration.java

@@ -0,0 +1,74 @@
+package org.eclipse.kura.rest.network.configuration.provider.test.responses;


Copyright header is missing

nicolatimeus · 2023-10-31T15:09:07Z

...se/kura/rest/network/configuration/provider/test/responses/RestNetworkConfigurationJson.java

@@ -0,0 +1,19 @@
+package org.eclipse.kura.rest.network.configuration.provider.test.responses;


Copyright header is missing

Signed-off-by: SimoneFiorani <[email protected]>

nicolatimeus · 2023-11-02T13:29:31Z

This bundle should only be added to the distribution profiles with network management support, it is not needed on the -nn profiles. Please remove the new permission from the snapshot_0.xml of nn profiles and modify the ant script to add the new bundle only if we are not building an -nn profile.

Signed-off-by: SimoneFiorani <[email protected]>

sfiorani · 2023-11-17T08:57:25Z

Eclipse team approved changes

github-actions · 2023-11-17T11:53:50Z

The backport to release-5.4.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-5.4.0 release-5.4.0
# Navigate to the new working tree
cd .worktrees/backport-release-5.4.0
# Create a new branch
git switch --create backport-4915-to-release-5.4.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee2c973f7bff56f555e987f4d819611dc7635d40
# Push it to GitHub
git push --set-upstream origin backport-4915-to-release-5.4.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-5.4.0

Then, create a pull request where the base branch is release-5.4.0 and the compare/head branch is backport-4915-to-release-5.4.0.

…onfiguration management (eclipse-kura#4915) * Added first structure of bundle Signed-off-by: SimoneFiorani <[email protected]> * Rebase branch on develop Signed-off-by: SimoneFiorani <[email protected]> * working apis, missing tests Signed-off-by: SimoneFiorani <[email protected]> * Added tests, update code with comments Signed-off-by: SimoneFiorani <[email protected]> * Fixed formatter problem and duplications Signed-off-by: SimoneFiorani <[email protected]> * Fixed general problems Signed-off-by: SimoneFiorani <[email protected]> * Fixed headers and conflicts Signed-off-by: SimoneFiorani <[email protected]> * Resolving conflicts Signed-off-by: SimoneFiorani <[email protected]> * Resolved all conflicts Signed-off-by: SimoneFiorani <[email protected]> * Added bundle configuration only in not-nn profiles Signed-off-by: SimoneFiorani <[email protected]> * fix: Deleted incorrectly named license files --------- Signed-off-by: SimoneFiorani <[email protected]> Co-authored-by: nicolatimeus <[email protected]>

…onfiguration management (#4915) [backport release-5.4.0] (#4992) feat(rest.network.configuration.provider): new rest api for network configuration management (#4915) * Added first structure of bundle * Rebase branch on develop * working apis, missing tests * Added tests, update code with comments * Fixed formatter problem and duplications * Fixed general problems * Fixed headers and conflicts * Resolving conflicts * Resolved all conflicts * Added bundle configuration only in not-nn profiles * fix: Deleted incorrectly named license files --------- Signed-off-by: SimoneFiorani <[email protected]> Co-authored-by: sfiorani <[email protected]>

sfiorani force-pushed the rest-network-configuration branch 2 times, most recently from 82591f8 to bf6f717 Compare October 26, 2023 16:01

nicolatimeus reviewed Oct 27, 2023

View reviewed changes

sfiorani force-pushed the rest-network-configuration branch from 7daabcb to 6bb17bc Compare October 27, 2023 15:54

sfiorani marked this pull request as ready for review October 27, 2023 16:00

sfiorani mentioned this pull request Oct 30, 2023

docs: Added Network Configuration Rest APIs documentation #4933

Merged

nicolatimeus reviewed Oct 31, 2023

View reviewed changes

sfiorani added 8 commits November 2, 2023 09:59

Added first structure of bundle

82f0d58

Signed-off-by: SimoneFiorani <[email protected]>

Rebase branch on develop

958d35f

Signed-off-by: SimoneFiorani <[email protected]>

working apis, missing tests

f5843cb

Signed-off-by: SimoneFiorani <[email protected]>

Added tests, update code with comments

beaf0c9

Signed-off-by: SimoneFiorani <[email protected]>

Fixed formatter problem and duplications

f587df1

Signed-off-by: SimoneFiorani <[email protected]>

Fixed general problems

a64510e

Signed-off-by: SimoneFiorani <[email protected]>

Fixed headers and conflicts

73c85c0

Signed-off-by: SimoneFiorani <[email protected]>

Resolving conflicts

42c6c14

Signed-off-by: SimoneFiorani <[email protected]>

sfiorani force-pushed the rest-network-configuration branch from 7c7debf to 42c6c14 Compare November 2, 2023 09:16

Resolved all conflicts

aea767d

Signed-off-by: SimoneFiorani <[email protected]>

Added bundle configuration only in not-nn profiles

03c09dc

Signed-off-by: SimoneFiorani <[email protected]>

mattdibi added the backport release-5.4.0 label Nov 2, 2023

Merge branch 'develop' into rest-network-configuration

2cdd9ba

fix: Deleted incorrectly named license files

ef66f2a

nicolatimeus approved these changes Nov 17, 2023

View reviewed changes

nicolatimeus merged commit ee2c973 into eclipse-kura:develop Nov 17, 2023
1 check passed

nicolatimeus mentioned this pull request Nov 17, 2023

feat(rest.network.configuration.provider): new rest api for network configuration management (#4915) [backport release-5.4.0] #4992

Merged

This was referenced Nov 23, 2023

fix(linux.net): prefer dnsmasq over udhcpd #5017

Closed

fix(nm): load dhcp server configuration after change #5018

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(rest.network.configuration.provider): new rest api for network configuration management #4915

feat(rest.network.configuration.provider): new rest api for network configuration management #4915

sfiorani commented Oct 25, 2023

nicolatimeus Oct 27, 2023

nicolatimeus Oct 27, 2023

nicolatimeus Oct 27, 2023

nicolatimeus Oct 27, 2023

nicolatimeus Oct 27, 2023

nicolatimeus Oct 27, 2023 •

edited

Loading

nicolatimeus commented Oct 30, 2023

sfiorani commented Oct 30, 2023

nicolatimeus commented Oct 31, 2023

nicolatimeus Oct 31, 2023

nicolatimeus Oct 31, 2023

nicolatimeus Oct 31, 2023

nicolatimeus Oct 31, 2023

nicolatimeus commented Nov 2, 2023

sfiorani commented Nov 17, 2023

github-actions bot commented Nov 17, 2023


		private static final Logger logger = LoggerFactory.getLogger(NetworkConfigurationRestService.class);

		private static final String APP_ID = "NETCONF-V1";


		private static final String SNAPSHOT_SUBTASK_ID = "snapshot";

		private final RequestHandler requestHandler = new JaxRsRequestHandlerProxy(this);

		@@ -0,0 +1,19 @@
		#
		# Copyright (c) 2021 Eurotech and/or its affiliates and others

		@@ -0,0 +1,15 @@
		#
		# Copyright (c) 2021 Eurotech and/or its affiliates and others

		@@ -0,0 +1,74 @@
		package org.eclipse.kura.rest.network.configuration.provider.test.responses;

feat(rest.network.configuration.provider): new rest api for network configuration management #4915

feat(rest.network.configuration.provider): new rest api for network configuration management #4915

Conversation

sfiorani commented Oct 25, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicolatimeus Oct 27, 2023 • edited Loading

Choose a reason for hiding this comment

nicolatimeus commented Oct 30, 2023

sfiorani commented Oct 30, 2023

nicolatimeus commented Oct 31, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nicolatimeus commented Nov 2, 2023

sfiorani commented Nov 17, 2023

github-actions bot commented Nov 17, 2023

nicolatimeus Oct 27, 2023 •

edited

Loading