Merge 9338090 into 696f7c4

RackHD · May 9, 2018 · 769b18e · 769b18e
2 parents 696f7c4 + 9338090
commit 769b18e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/models/lookup.js b/lib/models/lookup.js
@@ -95,6 +95,7 @@ function LookupModelFactory (
             assert.string(node, 'node');
             assert.string(macAddress, 'macAddress');
 
+            macAddress = macAddress.toLowerCase();
             var query = { macAddress: macAddress };
             var options = {
                 new: true,
@@ -129,6 +130,7 @@ function LookupModelFactory (
 
             var self = this;
 
+            macAddress = macAddress.toLowerCase();
             return self.findOne({ macAddress: macAddress }).then(function (record) {
                 if (record) {
                     return self.update(
@@ -145,6 +147,7 @@ function LookupModelFactory (
             });
         },
         setIp: function(ipAddress, macAddress) {
+            macAddress = macAddress.toLowerCase();
             switch(dbType) {
                 case 'mongo':
                     return this.setIpMongo(ipAddress, macAddress);

diff --git a/spec/lib/models/lookup-spec.js b/spec/lib/models/lookup-spec.js
@@ -186,7 +186,7 @@ describe('Models.Lookup', function () {
                     'macAddress'
                 ).then(function () {
                     expect(waterline.lookups.findAndModifyMongo).to.have.been.calledOnce;
-                    var query = { macAddress: 'macAddress' };
+                    var query = { macAddress: 'macaddress' };
                     var update = { $set: { node:  waterline.lookups.mongo.objectId('node') }};
                     expect(waterline.lookups.findAndModifyMongo.firstCall.args[0])
                         .to.deep.equal(query);
@@ -212,7 +212,7 @@ describe('Models.Lookup', function () {
                     'proxy',
                     'macAddress'
                 ).then(function () {
-                    expect(findOne).to.have.been.calledWith({ macAddress: 'macAddress' });
+                    expect(findOne).to.have.been.calledWith({ macAddress: 'macaddress' });
                     expect(update).to.have.been.calledWith({ id: 'id' }, { proxy: 'proxy' });
                 });
             });
@@ -224,7 +224,7 @@ describe('Models.Lookup', function () {
                     'proxy',
                     'macAddress'
                 )).to.be.rejectedWith(Errors.NotFoundError).then(function () {
-                    expect(findOne).to.have.been.calledWith({ macAddress: 'macAddress' });
+                    expect(findOne).to.have.been.calledWith({ macAddress: 'macaddress' });
                 });
             });
         });