From 73ff900acb8e8c644f501a8bb7ce90b7942ee5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 18 Jul 2016 18:54:15 +0200
Subject: [PATCH] Feature #4620: Minor fixes

---
 include/VirtualNetwork.h | 13 -------------
 src/vm/VirtualMachine.cc |  9 +++++----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/include/VirtualNetwork.h b/include/VirtualNetwork.h
index a1eafff4d8..8f7b511f54 100644
--- a/include/VirtualNetwork.h
+++ b/include/VirtualNetwork.h
@@ -347,19 +347,6 @@ public:
             int                     vrid,
             const vector<string>&   inherit_attrs);
 
-    /**
-     * Modifies the given address attribute adding the following attributes:
-     *  * IP:  leased from network
-     *  * MAC: leased from network
-     *  * BRIDGE: for this virtual network
-     *  @param address attribute for the VM template
-     *  @param vid of the VM getting the lease
-     *  @return 0 on success
-     */
-    int address_attribute(
-            VectorAttribute *       addr,
-            int                     vid);
-
     /**
      * From a Security Group rule that uses this vnet, creates a new rule
      * copy for each AR.
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index ce3e1fff8f..80a3cf8936 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -148,7 +148,7 @@ const char * VirtualMachine::NETWORK_CONTEXT[][2] = {
         {"VLAN_ID", "VLAN_ID"},
         {"VROUTER_IP", "VROUTER_IP"},
         {"VROUTER_MANAGEMENT", "VROUTER_MANAGEMENT"}};
-const int VirtualMachine::NUM_NETWORK_CONTEXT = 10;
+const int VirtualMachine::NUM_NETWORK_CONTEXT = 11;
 
 const char*  VirtualMachine::NETWORK6_CONTEXT[][2] = {
         {"IP6", "IP6_GLOBAL"},
@@ -1678,13 +1678,14 @@ error_nic:
 error_pci:
     if (rc == -1)
     {
-        oss << "Incompatible clusters in PCI (TYPE=NIC). It is is not the same"
-            << " as the one used by other VM elements (cluster "
+        oss << "Incompatible clusters in PCI (TYPE=NIC). Network for PCI "<< incomp_id
+            << " is not the same as the one used by other VM elements (cluster "
             << one_util::join(cluster_ids, ',') << ")";
     }
     else
     {
-        oss << "Missing clusters. Network for PCI device of TYPE=NIC";
+        oss << "Missing clusters. Network for PCI "<< incomp_id
+            << " is not in any cluster";
     }
 
     goto error_common;