OS-1084 allow primary to be set false on a NIC for create for purpose…

…s of building payloads from a template.
MerlinDMC · Apr 7, 2012 · db94e34 · db94e34
1 parent 0ce7d0d
commit db94e34
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 1 deletion.
diff --git a/src/vm/node_modules/VM.js b/src/vm/node_modules/VM.js
diff --git a/src/vm/tests/test-primary-flag.js b/src/vm/tests/test-primary-flag.js
@@ -245,3 +245,89 @@ test('create VM with 3 nics (all primary)', {'timeout': 240000}, function(t) {
         t.end();
     });
 });
+
+test('create VM with 3 nics (one primary, 2 false)', {'timeout': 240000}, function(t) {
+    var state = { 'brand': 'joyent' };
+    vmtest.on_new_vm(t, dataset_uuid,
+        {
+            'autoboot': false,
+            'do_not_inventory': true,
+            'alias': 'autozone-' + process.pid,
+            'nowait': true,
+            'nics': [
+                {'primary': true},
+                {'primary': false},
+                {'primary': false}
+            ]}, state,
+    [
+        function (cb) {
+            VM.load(state.uuid, function(err, obj) {
+                var has_primary = 0;
+                var n;
+
+                if (err) {
+                    t.ok(false, 'load obj from new VM: ' + err.message);
+                    return cb(err);
+                }
+
+                for (n in obj.nics) {
+                    n = obj.nics[n];
+                    if (n.hasOwnProperty('primary')) {
+                        t.ok((n.primary === true),
+                            'nic.primary is boolean true');
+                        has_primary++;
+                    }
+                }
+
+                t.ok((has_primary === 1), 'VM has ' + has_primary + ' primary'
+                    + ' nics, expected: 1');
+                cb();
+            });
+        }
+    ],
+    function (err) {
+        t.end();
+    });
+});
+
+test('create VM with 3 nics (all false)', {'timeout': 240000}, function(t) {
+    var state = { 'brand': 'joyent' };
+    vmtest.on_new_vm(t, dataset_uuid,
+        {
+            'autoboot': false,
+            'do_not_inventory': true,
+            'alias': 'autozone-' + process.pid,
+            'nowait': true,
+            'nics': [
+                {'primary': false},
+                {'primary': false},
+                {'primary': false}
+            ]}, state, [
+                function (cb) {
+                    VM.load(state.uuid, function(err, obj) {
+                        var has_primary = 0;
+                        var n;
+
+                        if (err) {
+                            t.ok(false, 'load obj from new VM: ' + err.message);
+                            return cb(err);
+                        }
+
+                        for (n in obj.nics) {
+                            n = obj.nics[n];
+                            if (n.hasOwnProperty('primary')) {
+                                t.ok((n.primary === true),
+                                    'nic.primary is boolean true');
+                                has_primary++;
+                            }
+                        }
+
+                        t.ok((has_primary === 1), 'VM has ' + has_primary + ' primary'
+                            + ' nics, expected: 1');
+                        cb();
+                    });
+            }],
+    function (err) {
+        t.end();
+    });
+});