[#1247] More renames

diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
index 8771f9d113dd6605c31249b814e1a0c377fcf842..aa0705ae0de9e8a0ced068e422e01d65b7545909 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
@@ -448,7 +448,7 @@ public:
               << audit_entry->getObjectId() << ", "
               << static_cast<int>(audit_entry->getModificationType()) << ", "
               << audit_entry->getModificationTime() << ", "
-              << audit_entry->getModificationId() << ", "
+              << audit_entry->getRevisionId() << ", "
               << audit_entry->getLogMessage()
               << std::endl;
         }
@@ -4130,7 +4130,7 @@ TEST_F(MySqlConfigBackendDHCPv4Test, multipleAuditEntries) {
         size_t partial_size =
             cbptr_->getRecentAuditEntries(server_selector,
                                           (*it)->getModificationTime(),
-                                          (*it)->getModificationId()).size();
+                                          (*it)->getRevisionId()).size();
         EXPECT_EQ(partial_size + 1,
                   std::distance(it, mod_time_idx.end()));
     }

diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
index 3ff44030977c6326018773513fd41cf45e714731..a6c05460d2a1b20913c0f67d29945d2d584849dd 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
@@ -496,7 +496,7 @@ public:
               << audit_entry->getObjectId() << ", "
               << static_cast<int>(audit_entry->getModificationType()) << ", "
               << audit_entry->getModificationTime() << ", "
-              << audit_entry->getModificationId() << ", "
+              << audit_entry->getRevisionId() << ", "
               << audit_entry->getLogMessage()
               << std::endl;
         }
@@ -4305,7 +4305,7 @@ TEST_F(MySqlConfigBackendDHCPv6Test, multipleAuditEntries) {
         size_t partial_size =
             cbptr_->getRecentAuditEntries(server_selector,
                                           (*it)->getModificationTime(),
-                                          (*it)->getModificationId()).size();
+                                          (*it)->getRevisionId()).size();
         EXPECT_EQ(partial_size + 1,
                   std::distance(it, mod_time_idx.end()));
     }

diff --git a/src/lib/database/audit_entry.cc b/src/lib/database/audit_entry.cc
index 08d5de13e1a6cf330ce6388f657e98c0ee615b2d..4c8782a6ff70b179a2e0c55f6599a5e045a3c7b2 100644 (file)
--- a/src/lib/database/audit_entry.cc
+++ b/src/lib/database/audit_entry.cc
@@ -15,13 +15,13 @@ AuditEntry::AuditEntry(const std::string& object_type,
                        const uint64_t object_id,
                        const ModificationType& modification_type,
                        const boost::posix_time::ptime& modification_time,
-                       const uint64_t id,
+                       const uint64_t revision_id,
                        const std::string& log_message)
     : object_type_(object_type),
       object_id_(object_id),
       modification_type_(modification_type),
       modification_time_(modification_time),
-      id_(id),
+      revision_id_(revision_id),
       log_message_(log_message) {
     // Check if the provided values are sane.
     validate();
@@ -30,13 +30,13 @@ AuditEntry::AuditEntry(const std::string& object_type,
 AuditEntry::AuditEntry(const std::string& object_type,
                        const uint64_t object_id,
                        const ModificationType& modification_type,
-                       const uint64_t id,
+                       const uint64_t revision_id,
                        const std::string& log_message)
     : object_type_(object_type),
       object_id_(object_id),
       modification_type_(modification_type),
       modification_time_(boost::posix_time::microsec_clock::local_time()),
-      id_(id),
+      revision_id_(revision_id),
       log_message_(log_message) {
     // Check if the provided values are sane.
     validate();
@@ -47,11 +47,12 @@ AuditEntry::create(const std::string& object_type,
                    const uint64_t object_id,
                    const ModificationType& modification_type,
                    const boost::posix_time::ptime& modification_time,
-                   const uint64_t id,
+                   const uint64_t revision_id,
                    const std::string& log_message) {
     return (boost::make_shared<AuditEntry>(object_type, object_id,
                                            modification_type,
-                                           modification_time, id,
+                                           modification_time,
+                                           revision_id,
                                            log_message));
 }
 
@@ -59,10 +60,11 @@ AuditEntryPtr
 AuditEntry::create(const std::string& object_type,
                    const uint64_t object_id,
                    const ModificationType& modification_type,
-                   const uint64_t id,
+                   const uint64_t revision_id,
                    const std::string& log_message) {
     return (boost::make_shared<AuditEntry>(object_type, object_id,
-                                           modification_type, id,
+                                           modification_type,
+                                           revision_id,
                                            log_message));
 }
 

diff --git a/src/lib/database/audit_entry.h b/src/lib/database/audit_entry.h
index c26fe46449434fae7a397263a9ac47f1dd92938b..b9466e356b2f29d8f48314fad4dd259a59502700 100644 (file)
--- a/src/lib/database/audit_entry.h
+++ b/src/lib/database/audit_entry.h
@@ -82,14 +82,14 @@ public:
     /// @param object_id identifier of the modified record in this table.
     /// @param modification_type type of the modification, e.g. DELETE.
     /// @param modification_time time of modification for that record.
-    /// @param id identifier of the revision.
+    /// @param revision_id identifier of the revision.
     /// @param log_message optional log message associated with the
     /// modification.
     AuditEntry(const std::string& object_type,
                const uint64_t object_id,
                const ModificationType& modification_type,
                const boost::posix_time::ptime& modification_time,
-               const uint64_t id,
+               const uint64_t revision_id,
                const std::string& log_message);
 
     /// @brief Constructor using default modification time.
@@ -97,13 +97,13 @@ public:
     /// @param object_type name of the table where data was modified.
     /// @param object_id identifier of the modified record in this table.
     /// @param modification_type type of the modification, e.g. DELETE.
-    /// @param id identifier of the revision.
+    /// @param revision_id identifier of the revision.
     /// @param log_message optional log message associated with the
     /// modification.
     AuditEntry(const std::string& object_type,
                const uint64_t object_id,
                const ModificationType& modification_type,
-               const uint64_t id,
+               const uint64_t revision_id,
                const std::string& log_message);
 
     /// @brief Factory function creating an instance of @c AuditEntry.
@@ -117,7 +117,7 @@ public:
     /// @param object_id identifier of the modified record in this table.
     /// @param modification_type type of the modification, e.g. DELETE.
     /// @param modification_time time of modification for that record.
-    /// @param id identifier of the revision.
+    /// @param revision_id identifier of the revision.
     /// @param log_message optional log message associated with the
     /// modification.
     ///
@@ -126,7 +126,7 @@ public:
                                 const uint64_t object_id,
                                 const ModificationType& modification_type,
                                 const boost::posix_time::ptime& modification_time,
-                                const uint64_t id,
+                                const uint64_t revision_id,
                                 const std::string& log_message);
 
     /// @brief Factory function creating an instance of @c AuditEntry.
@@ -139,7 +139,7 @@ public:
     /// @param object_type name of the table where data was modified.
     /// @param object_id identifier of the modified record in this table.
     /// @param modification_type type of the modification, e.g. DELETE.
-    /// @param id identifier of the revision.
+    /// @param revision_id identifier of the revision.
     /// @param log_message optional log message associated with the
     /// modification.
     ///
@@ -147,7 +147,7 @@ public:
     static AuditEntryPtr create(const std::string& object_type,
                                 const uint64_t object_id,
                                 const ModificationType& modification_type,
-                                const uint64_t id,
+                                const uint64_t revision_id,
                                 const std::string& log_message);
 
     /// @brief Returns object type.
@@ -181,8 +181,8 @@ public:
     /// @brief Returns revision id aka modification id.
     ///
     /// @return Identifier of the revision.
-    uint64_t getModificationId() const {
-        return (id_);
+    uint64_t getRevisionId() const {
+        return (revision_id_);
     }
 
     /// @brief Returns log message.
@@ -213,7 +213,7 @@ private:
     boost::posix_time::ptime modification_time_;
 
     /// @brief Revision id aka modification id.
-    uint64_t id_;
+    uint64_t revision_id_;
 
     /// @brief Log message.
     std::string log_message_;
@@ -267,7 +267,7 @@ typedef boost::multi_index_container<
                 boost::multi_index::const_mem_fun<
                     AuditEntry,
                     uint64_t,
-                    &AuditEntry::getModificationId
+                    &AuditEntry::getRevisionId
                 >
             >
         >,

diff --git a/src/lib/database/tests/audit_entry_unittest.cc b/src/lib/database/tests/audit_entry_unittest.cc
index dd62458f67150e3bfddae9e644b6b7aff6ac0864..1d41872265a5d079c662eb9eaf580f836003ccbb 100644 (file)
--- a/src/lib/database/tests/audit_entry_unittest.cc
+++ b/src/lib/database/tests/audit_entry_unittest.cc
@@ -96,7 +96,7 @@ TEST_F(AuditEntryTest, create) {
         EXPECT_EQ(10, audit_entry->getObjectId());
         EXPECT_EQ(AuditEntry::ModificationType::DELETE, audit_entry->getModificationType());
         EXPECT_EQ(fixedTime(), audit_entry->getModificationTime());
-        EXPECT_EQ(123, audit_entry->getModificationId());
+        EXPECT_EQ(123, audit_entry->getRevisionId());
         EXPECT_EQ("deleted subnet 10", audit_entry->getLogMessage());
     }
 
@@ -110,7 +110,7 @@ TEST_F(AuditEntryTest, create) {
         EXPECT_EQ(123, audit_entry->getObjectId());
         EXPECT_EQ(AuditEntry::ModificationType::CREATE, audit_entry->getModificationType());
         EXPECT_TRUE(almostEqualTime(audit_entry->getModificationTime()));
-        EXPECT_EQ(234, audit_entry->getModificationId());
+        EXPECT_EQ(234, audit_entry->getRevisionId());
         EXPECT_TRUE(audit_entry->getLogMessage().empty());
     }
 }

diff --git a/src/lib/process/cb_ctl_base.h b/src/lib/process/cb_ctl_base.h
index 436c63ceb44f7c6e6075a9c4174cd3833fb33ef7..456cb9dd740472c1b34fb3d70885960b6ebe4eaf 100644 (file)
--- a/src/lib/process/cb_ctl_base.h
+++ b/src/lib/process/cb_ctl_base.h
@@ -341,7 +341,7 @@ protected:
        // and pick the latest entry.
         const auto& index = audit_entries.get<db::AuditEntryModificationTimeIdTag>();
         last_audit_revision_time_ = (*index.rbegin())->getModificationTime();
-        last_audit_revision_id_ = (*index.rbegin())->getModificationId();
+        last_audit_revision_id_ = (*index.rbegin())->getRevisionId();
     }
 
     /// @brief Stores the most recent audit revision timestamp.