added method Node::setChassis
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 4 Aug 2016 18:14:11 +0000 (21:14 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 4 Aug 2016 18:14:11 +0000 (21:14 +0300)
src/java/build/pack.cmd
src/java/build/pack.sh
src/server/core/node.cpp
src/server/include/nms_objects.h

index 259b757..5dd7b72 100644 (file)
@@ -1,7 +1,7 @@
 @echo off
 call set_build_number.cmd
 rem set version=2.0-RC1-%build_number%
-set version=2.0.3
+set version=2.1-M1
 
 cd win32.win32.x86
 zip -r nxmc-%version%-win32-x86.zip nxmc
index 817ddfe..fe785c7 100755 (executable)
@@ -2,7 +2,7 @@
 
 . ./set_build_number.sh
 #version=2.0-RC2-$build_number
-version=2.0.3
+version=2.1-M1
 
 cd win32.win32.x86
 zip -r nxmc-$version-win32-x86.zip nxmc
index 5c6b9c9..9d297b8 100644 (file)
@@ -7769,3 +7769,21 @@ const TCHAR *Node::typeName(NodeType type)
    static const TCHAR *names[] = { _T("Unknown"), _T("Physical"), _T("Virtual"), _T("Controller") };
    return ((type >= 0) && (type < sizeof(names) / sizeof(const TCHAR *))) ? names[type] : names[0];
 }
+
+/**
+ * Set node's chassis
+ */
+void Node::setChassis(UINT32 chassisId)
+{
+   lockProperties();
+   if (chassisId == m_chassisId)
+   {
+      unlockProperties();
+      return;
+   }
+
+   m_chassisId = chassisId;
+   unlockProperties();
+
+   updatePhysicalContainerBinding(OBJECT_CHASSIS, chassisId);
+}
index 584df2a..9536142 100644 (file)
@@ -1566,6 +1566,7 @@ public:
    void updateRoutingTable();
        void checkSubnetBinding();
    AccessPointState getAccessPointState(AccessPoint *ap, SNMP_Transport *snmpTransport);
+   void setChassis(UINT32 chassisId);
 
    bool isReadyForStatusPoll();
    bool isReadyForConfigurationPoll();