HC2VPP-7 - Split vpp state/Cli RPC to separate module

Introduces VppManageModule containing
- Vpp state attributes
- CLI RPC support
- Keep-alive

Change-Id: I8907e57132cc9e57840aa3b9607fa131a77f767d
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

3 files changed, 0 insertions, 421 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java
deleted file mode 100644
index 2b9f59209..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/ArpTerminationTableEntryCustomizer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.hc2vpp.v3po.vpp;
-
-import com.google.common.base.Preconditions;
-import io.fd.hc2vpp.common.translate.util.AddressTranslator;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.BdIpMacAddDel;
-import io.fd.vpp.jvpp.core.dto.BdIpMacAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domain.attributes.arp.termination.table.ArpTerminationTableEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domain.attributes.arp.termination.table.ArpTerminationTableEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.bridge.domains.BridgeDomain;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Writer Customizer responsible for ARP termination table management.<br> Sends {@code bd_ip_mac_add_del} message to
- * VPP.<br> Equivalent of invoking {@code vppctl set bridge-domain arp term} command.
- */
-public class ArpTerminationTableEntryCustomizer extends FutureJVppCustomizer
-        implements ListWriterCustomizer<ArpTerminationTableEntry, ArpTerminationTableEntryKey>, ByteDataTranslator,
-        AddressTranslator, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ArpTerminationTableEntryCustomizer.class);
-
-    private final NamingContext bdContext;
-
-    public ArpTerminationTableEntryCustomizer(@Nonnull final FutureJVppCore futureJvpp,
-                                              @Nonnull final NamingContext bdContext) {
-        super(futureJvpp);
-        this.bdContext = Preconditions.checkNotNull(bdContext, "bdContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<ArpTerminationTableEntry> id,
-                                       @Nonnull final ArpTerminationTableEntry dataAfter,
-                                       @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        LOG.debug("Creating ARP termination table entry: {} {}", id, dataAfter);
-        bdIpMacAddDel(id, dataAfter, writeContext, true);
-        LOG.debug("L2 ARP termination table entry created successfully: {} {}", id, dataAfter);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ArpTerminationTableEntry> id,
-                                        @Nonnull final ArpTerminationTableEntry dataBefore,
-                                        @Nonnull final ArpTerminationTableEntry dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new UnsupportedOperationException(
-                "ARP termination table entry update is not supported. It has to be deleted and then created.");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<ArpTerminationTableEntry> id,
-                                        @Nonnull final ArpTerminationTableEntry dataBefore,
-                                        @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-        LOG.debug("Deleting ARP termination table entry entry: {} {}", id, dataBefore);
-        bdIpMacAddDel(id, dataBefore, writeContext, false);
-        LOG.debug("ARP termination table entry deleted successfully: {} {}", id, dataBefore);
-    }
-
-    private void bdIpMacAddDel(@Nonnull final InstanceIdentifier<ArpTerminationTableEntry> id,
-                               @Nonnull final ArpTerminationTableEntry entry,
-                               final WriteContext writeContext, boolean isAdd) throws WriteFailedException {
-        final String bdName = id.firstKeyOf(BridgeDomain.class).getName();
-        final int bdId = bdContext.getIndex(bdName, writeContext.getMappingContext());
-
-        final BdIpMacAddDel request = createRequest(entry, bdId, isAdd);
-        LOG.debug("Sending l2FibAddDel request: {}", request);
-        final CompletionStage<BdIpMacAddDelReply> replyCompletionStage =
-                getFutureJVpp().bdIpMacAddDel(request);
-
-        getReplyForWrite(replyCompletionStage.toCompletableFuture(), id);
-    }
-
-    private BdIpMacAddDel createRequest(final ArpTerminationTableEntry entry, final int bdId, boolean isAdd) {
-        final BdIpMacAddDel request = new BdIpMacAddDel();
-        request.bdId = bdId;
-        request.isAdd = booleanToByte(isAdd);
-        request.macAddress = parseMac(entry.getPhysAddress().getValue());
-
-        final IpAddress ipAddress = entry.getIpAddress();
-
-        request.ipAddress = ipAddressToArray(ipAddress);
-        request.isIpv6 = booleanToByte(isIpv6(ipAddress));
-
-        return request;
-    }
-}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java
deleted file mode 100644
index 2962ec578..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/BridgeDomainCustomizer.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.hc2vpp.v3po.vpp;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.stream.Collectors.toList;
-
-import com.google.common.base.Preconditions;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.common.translate.util.ReferenceCheck;
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDel;
-import io.fd.vpp.jvpp.core.dto.BridgeDomainAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.Collections;
-import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.GuardedBy;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.L2BaseAttributes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.base.attributes.interconnection.BridgeBased;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.bridge.domains.BridgeDomain;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.bridge.domains.BridgeDomainKey;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class BridgeDomainCustomizer extends FutureJVppCustomizer
-        implements ListWriterCustomizer<BridgeDomain, BridgeDomainKey>, ByteDataTranslator, JvppReplyConsumer,
-        ReferenceCheck {
-
-    private static final Logger LOG = LoggerFactory.getLogger(BridgeDomainCustomizer.class);
-
-    private static final byte ADD_OR_UPDATE_BD = (byte) 1;
-    private final NamingContext bdContext;
-    @GuardedBy("this")
-    private int bridgeDomainIndexCounter = 1;
-
-    public BridgeDomainCustomizer(@Nonnull final FutureJVppCore futureJVppCore,
-                                  @Nonnull final NamingContext bdContext) {
-        super(futureJVppCore);
-        this.bdContext = Preconditions.checkNotNull(bdContext, "bdContext should not be null");
-    }
-
-    private BridgeDomainAddDelReply addOrUpdateBridgeDomain(@Nonnull final InstanceIdentifier<BridgeDomain> id,
-                                                            final int bdId, @Nonnull final BridgeDomain bd)
-            throws WriteFailedException {
-        final BridgeDomainAddDelReply reply;
-        final BridgeDomainAddDel request = new BridgeDomainAddDel();
-        request.bdId = bdId;
-        request.flood = booleanToByte(bd.isFlood());
-        request.forward = booleanToByte(bd.isForward());
-        request.learn = booleanToByte(bd.isLearn());
-        request.uuFlood = booleanToByte(bd.isUnknownUnicastFlood());
-        request.arpTerm = booleanToByte(bd.isArpTermination());
-        request.isAdd = ADD_OR_UPDATE_BD;
-
-        reply = getReplyForWrite(getFutureJVpp().bridgeDomainAddDel(request).toCompletableFuture(), id);
-        LOG.debug("Bridge domain {} (id={}) add/update successful", bd.getName(), bdId);
-        return reply;
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomain> id,
-                                       @Nonnull final BridgeDomain dataBefore,
-                                       @Nonnull final WriteContext ctx)
-            throws WriteFailedException {
-        LOG.debug("writeCurrentAttributes: id={}, current={}, ctx={}", id, dataBefore, ctx);
-        final String bdName = dataBefore.getName();
-
-        // Invoke 1. check index, 2. increase index 3. create ND 4. store mapping in a synchronized block to prevent
-        // race conditions in case of concurrent invocation
-        synchronized (this) {
-            int index;
-            if (bdContext.containsIndex(bdName, ctx.getMappingContext())) {
-                index = bdContext.getIndex(bdName, ctx.getMappingContext());
-            } else {
-                // Critical section due to bridgeDomainIndexCounter read and write access
-                // TODO HONEYCOMB-199 move this "get next available index" into naming context or an adapter
-                // or a dedicated object
-
-                // Use counter to assign bridge domain index, but still check naming context if it's not taken there
-                while (bdContext.containsName(bridgeDomainIndexCounter, ctx.getMappingContext())) {
-                    bridgeDomainIndexCounter++;
-                }
-                index = bridgeDomainIndexCounter;
-            }
-            addOrUpdateBridgeDomain(id, index, dataBefore);
-            bdContext.addName(index, bdName, ctx.getMappingContext());
-        }
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomain> id,
-                                        @Nonnull final BridgeDomain dataBefore,
-                                        @Nonnull final WriteContext ctx)
-            throws WriteFailedException {
-        LOG.debug("deleteCurrentAttributes: id={}, dataBefore={}, ctx={}", id, dataBefore, ctx);
-        final String bdName = id.firstKeyOf(BridgeDomain.class).getName();
-
-        final com.google.common.base.Optional<Interfaces> after =
-                ctx.readAfter(InstanceIdentifier.create(Interfaces.class));
-
-        if (after.isPresent()) {
-            checkReferenceExist(id, Optional.ofNullable(after.get().getInterface())
-                    .orElse(Collections.emptyList())
-                    .stream()
-                    .map(iface -> Optional.ofNullable(iface.getAugmentation(VppInterfaceAugmentation.class))
-                            .map(VppInterfaceAugmentation::getL2)
-                            .map(L2BaseAttributes::getInterconnection)
-                            .orElse(null))
-                    .filter(interconnection -> interconnection instanceof BridgeBased)
-                    .map(BridgeBased.class::cast)
-                    .filter(bridgeBased -> bdName.equals(bridgeBased.getBridgeDomain()))
-                    .collect(toList()));
-        }
-
-        int bdId = bdContext.getIndex(bdName, ctx.getMappingContext());
-
-        final BridgeDomainAddDel request = new BridgeDomainAddDel();
-        request.bdId = bdId;
-
-        getReplyForWrite(getFutureJVpp().bridgeDomainAddDel(request).toCompletableFuture(), id);
-        LOG.debug("Bridge domain {} (id={}) deleted successfully", bdName, bdId);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<BridgeDomain> id,
-                                        @Nonnull final BridgeDomain dataBefore, @Nonnull final BridgeDomain dataAfter,
-                                        @Nonnull final WriteContext ctx)
-            throws WriteFailedException {
-        LOG.debug("updateCurrentAttributes: id={}, dataBefore={}, dataAfter={}, ctx={}", id, dataBefore, dataAfter,
-                ctx);
-
-        final String bdName = checkNotNull(dataAfter.getName());
-        checkArgument(bdName.equals(dataBefore.getName()),
-                "BridgeDomain name changed. It should be deleted and then created.");
-
-        addOrUpdateBridgeDomain(id, bdContext.getIndex(bdName, ctx.getMappingContext()), dataAfter);
-    }
-
-}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java
deleted file mode 100644
index 0eced8237..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/vpp/L2FibEntryCustomizer.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.hc2vpp.v3po.vpp;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.google.common.primitives.Longs;
-import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.hc2vpp.common.translate.util.MacTranslator;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.MappingContext;
-import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.L2FibAddDel;
-import io.fd.vpp.jvpp.core.dto.L2FibAddDelReply;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.concurrent.CompletionStage;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.L2FibFilter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.l2.fib.table.L2FibEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.l2.fib.table.L2FibEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.bridge.domains.BridgeDomain;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Writer Customizer responsible for L2 FIB create/delete operations.<br> Sends {@code l2_fib_add_del} message to
- * VPP.<br> Equivalent of invoking {@code vppctl l2fib add/del} command.
- */
-public class L2FibEntryCustomizer extends FutureJVppCustomizer
-        implements ListWriterCustomizer<L2FibEntry, L2FibEntryKey>, ByteDataTranslator, MacTranslator,
-        JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(L2FibEntryCustomizer.class);
-    public static final int NO_INTERFACE_REF = -1;
-
-    private final NamingContext bdContext;
-    private final NamingContext interfaceContext;
-
-    public L2FibEntryCustomizer(@Nonnull final FutureJVppCore futureJVppCore, @Nonnull final NamingContext bdContext,
-                                @Nonnull final NamingContext interfaceContext) {
-        super(futureJVppCore);
-        this.bdContext = checkNotNull(bdContext, "bdContext should not be null");
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
-                                       @Nonnull final L2FibEntry dataAfter, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-
-        LOG.debug("Creating L2 FIB entry: {} {}", id, dataAfter);
-        l2FibAddDel(id, dataAfter, writeContext, true);
-        LOG.debug("L2 FIB entry created successfully: {} {}", id, dataAfter);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
-                                        @Nonnull final L2FibEntry dataBefore, @Nonnull final L2FibEntry dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new UnsupportedOperationException(
-                "L2 FIB entry update is not supported. It has to be deleted and then created.");
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<L2FibEntry> id,
-                                        @Nonnull final L2FibEntry dataBefore, @Nonnull final WriteContext writeContext)
-            throws WriteFailedException {
-
-        LOG.debug("Deleting L2 FIB entry: {} {}", id, dataBefore);
-        l2FibAddDel(id, dataBefore, writeContext, false);
-        LOG.debug("L2 FIB entry deleted successfully: {} {}", id, dataBefore);
-    }
-
-    private void l2FibAddDel(@Nonnull final InstanceIdentifier<L2FibEntry> id, @Nonnull final L2FibEntry entry,
-                             final WriteContext writeContext, boolean isAdd) throws WriteFailedException {
-        final String bdName = id.firstKeyOf(BridgeDomain.class).getName();
-        final MappingContext mappingContext = writeContext.getMappingContext();
-        final int bdId = bdContext.getIndex(bdName, mappingContext);
-
-        final L2FibAddDel l2FibRequest = createL2FibRequest(entry, bdId, getCheckedInterfaceIndex(entry,
-                mappingContext), isAdd);
-        LOG.debug("Sending l2FibAddDel request: {}", l2FibRequest);
-        final CompletionStage<L2FibAddDelReply> l2FibAddDelReplyCompletionStage =
-                getFutureJVpp().l2FibAddDel(l2FibRequest);
-
-        getReplyForWrite(l2FibAddDelReplyCompletionStage.toCompletableFuture(), id);
-    }
-
-    private int getCheckedInterfaceIndex(final L2FibEntry entry, final MappingContext mappingContext) {
-        if (L2FibFilter.class == entry.getAction()) {
-            // if filter, interface should not be defined
-            checkArgument(entry.getOutgoingInterface() == null, "Interface reference should not be defined for type %s",
-                    L2FibFilter.class);
-            return NO_INTERFACE_REF;
-        } else {
-            // if type is not filter, interface reference is mandatory
-            return interfaceContext.getIndex(
-                    checkNotNull(entry.getOutgoingInterface(), "Interface reference should be defined for type %s",
-                            entry.getAction()), mappingContext);
-        }
-    }
-
-    private L2FibAddDel createL2FibRequest(final L2FibEntry entry, final int bdId, final int swIfIndex, boolean isAdd) {
-        final L2FibAddDel request = new L2FibAddDel();
-        request.mac = macToLong(entry.getPhysAddress().getValue());
-        request.bdId = bdId;
-        request.swIfIndex = swIfIndex;
-        request.isAdd = booleanToByte(isAdd);
-        if (isAdd) {
-            request.staticMac = booleanToByte(entry.isStaticConfig());
-            request.filterMac = booleanToByte(L2FibFilter.class == entry.getAction());
-        }
-        return request;
-    }
-
-    // mac address is string of the form: 11:22:33:44:55:66
-    // but VPP expects long value in the format 11:22:33:44:55:66:XX:XX
-    private long macToLong(final String macAddress) {
-        final byte[] mac = parseMac(macAddress);
-        return Longs.fromBytes(mac[0], mac[1], mac[2], mac[3],
-                mac[4], mac[5], (byte) 0, (byte) 0);
-    }
-}