diff --git a/docs/guide/network_depoyment_scenarios.md b/docs/guide/network_depoyment_scenarios.md index 0da1d87b993dcc8bdbefa0964bbcc638f7931ab0..3300e6104790f3bd85bf1c0e5769edb15cac3577 100644 --- a/docs/guide/network_depoyment_scenarios.md +++ b/docs/guide/network_depoyment_scenarios.md @@ -870,16 +870,16 @@ obuspa -c add Device.IP.Interface. obuspa -c add Device.IP.Interface. obuspa -c add Device.DHCPv4.Client. obuspa -c add Device.DHCPv4.Client. -obuspa -c add Device.Ethernet.X_IOPSYS_EU_MACVLAN. -obuspa -c add Device.Ethernet.X_IOPSYS_EU_MACVLAN. +obuspa -c add Device.Ethernet.X_IOWRT_EU_MACVLAN. +obuspa -c add Device.Ethernet.X_IOWRT_EU_MACVLAN. obuspa -c add Device.Ethernet.VLANTermination. obuspa -c add Device.Ethernet.Link. obuspa -c set Device.IP.Interface.1.Enable 1 obuspa -c set Device.IP.Interface.2.Enable 1 -obuspa -c set Device.IP.Interface.1.LowerLayers Device.Ethernet.X_IOPSYS_EU_MACVLAN.1 -obuspa -c set Device.IP.Interface.2.LowerLayers Device.Ethernet.X_IOPSYS_EU_MACVLAN.2 +obuspa -c set Device.IP.Interface.1.LowerLayers Device.Ethernet.X_IOWRT_EU_MACVLAN.1 +obuspa -c set Device.IP.Interface.2.LowerLayers Device.Ethernet.X_IOWRT_EU_MACVLAN.2 obuspa -c set Device.DHCPv4.Client.1.Enable 1 obuspa -c set Device.DHCPv4.Client.2.Enable 1 @@ -887,8 +887,8 @@ obuspa -c set Device.DHCPv4.Client.2.Enable 1 obuspa -c set Device.DHCPv4.Client.1.Interface Device.IP.Interface.1 obuspa -c set Device.DHCPv4.Client.2.Interface Device.IP.Interface.2 -obuspa -c set Device.Ethernet.X_IOPSYS_EU_MACVLAN.1.LowerLayers Device.Ethernet.VLANTermination.1 -obuspa -c set Device.Ethernet.X_IOPSYS_EU_MACVLAN.2.LowerLayers Device.Ethernet.VLANTermination.1 +obuspa -c set Device.Ethernet.X_IOWRT_EU_MACVLAN.1.LowerLayers Device.Ethernet.VLANTermination.1 +obuspa -c set Device.Ethernet.X_IOWRT_EU_MACVLAN.2.LowerLayers Device.Ethernet.VLANTermination.1 obuspa -c set Device.Ethernet.VLANTermination.1.VLANID 100 obuspa -c set Device.Ethernet.VLANTermination.1.LowerLayers Device.Ethernet.Link.1 @@ -970,11 +970,11 @@ config device 'vlan_ter_1' ```bash $ obuspa -c get Device.IP.Interface.*.LowerLayers -Device.IP.Interface.1.LowerLayers => Device.Ethernet.X_IOPSYS_EU_MACVLAN.1 -Device.IP.Interface.2.LowerLayers => Device.Ethernet.X_IOPSYS_EU_MACVLAN.2 -$ obuspa -c get Device.Ethernet.X_IOPSYS_EU_MACVLAN.*.LowerLayers -Device.Ethernet.X_IOPSYS_EU_MACVLAN.1.LowerLayers => Device.Ethernet.VLANTermination.1 -Device.Ethernet.X_IOPSYS_EU_MACVLAN.2.LowerLayers => Device.Ethernet.VLANTermination.1 +Device.IP.Interface.1.LowerLayers => Device.Ethernet.X_IOWRT_EU_MACVLAN.1 +Device.IP.Interface.2.LowerLayers => Device.Ethernet.X_IOWRT_EU_MACVLAN.2 +$ obuspa -c get Device.Ethernet.X_IOWRT_EU_MACVLAN.*.LowerLayers +Device.Ethernet.X_IOWRT_EU_MACVLAN.1.LowerLayers => Device.Ethernet.VLANTermination.1 +Device.Ethernet.X_IOWRT_EU_MACVLAN.2.LowerLayers => Device.Ethernet.VLANTermination.1 $ obuspa -c get Device.Ethernet.VLANTermination.*.LowerLayers Device.Ethernet.VLANTermination.1.LowerLayers => Device.Ethernet.Link.1 $ obuspa -c get Device.Ethernet.Link.*.LowerLayers @@ -1000,18 +1000,18 @@ obuspa -c del Device.IP.Interface.* obuspa -c add Device.IP.Interface. obuspa -c add Device.IP.Interface. -obuspa -c add Device.Ethernet.X_IOPSYS_EU_MACVLAN. -obuspa -c add Device.Ethernet.X_IOPSYS_EU_MACVLAN. +obuspa -c add Device.Ethernet.X_IOWRT_EU_MACVLAN. +obuspa -c add Device.Ethernet.X_IOWRT_EU_MACVLAN. obuspa -c add Device.Ethernet.Link. obuspa -c set Device.IP.Interface.1.Enable 1 obuspa -c set Device.IP.Interface.2.Enable 1 -obuspa -c set Device.IP.Interface.1.LowerLayers Device.Ethernet.X_IOPSYS_EU_MACVLAN.1 -obuspa -c set Device.IP.Interface.2.LowerLayers Device.Ethernet.X_IOPSYS_EU_MACVLAN.2 +obuspa -c set Device.IP.Interface.1.LowerLayers Device.Ethernet.X_IOWRT_EU_MACVLAN.1 +obuspa -c set Device.IP.Interface.2.LowerLayers Device.Ethernet.X_IOWRT_EU_MACVLAN.2 -obuspa -c set Device.Ethernet.X_IOPSYS_EU_MACVLAN.1.LowerLayers Device.Ethernet.Link.1 -obuspa -c set Device.Ethernet.X_IOPSYS_EU_MACVLAN.2.LowerLayers Device.Ethernet.Link.1 +obuspa -c set Device.Ethernet.X_IOWRT_EU_MACVLAN.1.LowerLayers Device.Ethernet.Link.1 +obuspa -c set Device.Ethernet.X_IOWRT_EU_MACVLAN.2.LowerLayers Device.Ethernet.Link.1 obuspa -c set Device.Ethernet.Link.1.LowerLayers Device.Ethernet.Interface.3 @@ -1092,11 +1092,11 @@ config device 'mac_vlan_2' ```bash $ obuspa -c get Device.IP.Interface.*.LowerLayers -Device.IP.Interface.1.LowerLayers => Device.Ethernet.X_IOPSYS_EU_MACVLAN.1 -Device.IP.Interface.2.LowerLayers => Device.Ethernet.X_IOPSYS_EU_MACVLAN.2 -$ obuspa -c get Device.Ethernet.X_IOPSYS_EU_MACVLAN.*.LowerLayers -Device.Ethernet.X_IOPSYS_EU_MACVLAN.1.LowerLayers => Device.Ethernet.Link.1 -Device.Ethernet.X_IOPSYS_EU_MACVLAN.2.LowerLayers => Device.Ethernet.Link.1 +Device.IP.Interface.1.LowerLayers => Device.Ethernet.X_IOWRT_EU_MACVLAN.1 +Device.IP.Interface.2.LowerLayers => Device.Ethernet.X_IOWRT_EU_MACVLAN.2 +$ obuspa -c get Device.Ethernet.X_IOWRT_EU_MACVLAN.*.LowerLayers +Device.Ethernet.X_IOWRT_EU_MACVLAN.1.LowerLayers => Device.Ethernet.Link.1 +Device.Ethernet.X_IOWRT_EU_MACVLAN.2.LowerLayers => Device.Ethernet.Link.1 $ obuspa -c get Device.Ethernet.VLANTermination.*.LowerLayers $ obuspa -c get Device.Ethernet.Link.*.LowerLayers Device.Ethernet.Link.1.LowerLayers => Device.Ethernet.Interface.3 diff --git a/src/Makefile b/src/Makefile index e00582695e8076d80063abba7764c95e1be2ba54..e463bd264912b43a52b21c79d944676e1e175d03 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,7 +7,7 @@ LIB_LDFLAGS = $(LDFLAGS) FPIC := -fPIC ifeq ($(filter -DBBF_VENDOR_PREFIX=%,$(LIB_CFLAGS)),) -LIB_CFLAGS += -DBBF_VENDOR_PREFIX=\"X_IOPSYS_EU_\" +LIB_CFLAGS += -DBBF_VENDOR_PREFIX=\"X_IOWRT_EU_\" endif ifeq ($(NETMNGR_GRE_OBJ),y) diff --git a/src/interfacestack.c b/src/interfacestack.c index 3f278387ef471551b5125894b47f6c086b9e9d25..58e5612b5db7203d9b44bb0fc4975435f813a25b 100644 --- a/src/interfacestack.c +++ b/src/interfacestack.c @@ -180,7 +180,7 @@ static int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, vo goto end; } - /* Higher Layer is Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}. */ + /* Higher Layer is Device.Ethernet.X_IOWRT_EU_MACVLAN.{i}. */ uci_path_foreach_sections(bbfdm, "dmmap_network", "device", s) { if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,