Fix for container .env file and small updates

Since runrapid.py is now supporting more than 1 dataplane interface, we
need to use a port index in the rapid.env file for the dataplane ports.
In k8sdeployment.py, we only support 1 dataplane port, but we are
writing dp_ip1 and dp_mac1 in the environment file. The copyright dates
are also updated. Some references to VM have also been changed to instance.

Change-Id: Ie1d036c13ef5d6f0aa1f35aa068a9760a1cfc2a9
Signed-off-by: Luc Provoost <luc.provoost@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/k8sdeployment.py b/VNFs/DPPD-PROX/helper-scripts/rapid/k8sdeployment.py
index caf2d2e2..5e921d46 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/k8sdeployment.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/k8sdeployment.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.7
 
 ##
-## Copyright (c) 2019 Intel Corporation
+## Copyright (c) 2019-2020 Intel Corporation
 ##
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -175,11 +175,11 @@ class K8sDeployment:
             self._runtime_config.set("M%d" % pod.get_id(),
                                      "admin_ip", pod.get_admin_ip())
             self._runtime_config.set("M%d" % pod.get_id(),
-                                     "dp_mac", pod.get_dp_mac())
+                                     "dp_mac1", pod.get_dp_mac())
             self._runtime_config.set("M%d" % pod.get_id(),
                                      "dp_pci_dev", pod.get_dp_pci_dev())
             self._runtime_config.set("M%d" % pod.get_id(),
-                                     "dp_ip", pod.get_dp_ip())
+                                     "dp_ip1", pod.get_dp_ip())
 
         # Section [Varia]
         self._runtime_config.add_section("Varia")