Merge ~sankaraditya/cloud-init:topic-stanguturi-vmware-curtin-changes into cloud-init:master

[Sankar Tanguturi]

vmware customization: return network config format

For customizing the machines hosted on 'VMWare' hypervisor, the datasource
should return the 'network config' data in 'curtin' format.

Modify the code to read the customization configuration and return the converted data.

Added few tests.

LP: #1675063

cab90ca... by Sankar Tanguturi on 2017-03-14

  Fix the positioning of 'route' element.

  As per the documentation available at
  http://curtin.readthedocs.io/en/latest/topics/networking.html,
  'route' is not a child element of 'subnets'. It is a peer element of
  'nameserver' / 'physical' elements.

  Modified the code to fix the 'route' elements.
  Updated the tests.

6f4a2e0... by Sankar Tanguturi on 2017-03-15

  Populate the 'destination' key to the 'route' elements.

  Added the code to populate 'destination' key in the route elements.
  Added the new tests for the new function.

  Ignoring the routes for static IPV6 for now.
  Fixed the unit tests accordingly.

66391c3... by Sankar Tanguturi on 2017-03-15

Merge branch 'master' into topic-stanguturi-vmware-curtin

[Scott Moser (smoser)]

Sankar,

Hey, this looks really good. I do have some comments, but thanks for the good work.

a.) I think I'd like to move the conversion of the network config out of the 'get'.
   The LOG.debug "Applying the network customization" is actually incorrect in that
   no changes are done there. Lets move that to happen in the 'network_config' function.

    if self._network_config is not None:
        return self._network_config

    ## convert the network config from the data in 'self' here to to the desired
    ## 'network_config' format.
    nc = NicConcifugrator(self.conf.nics)
    cfg = get_vmware_network_config(...)
    self._network_config = cfg
    return self.network_config

b.) lets change get_vmware_network_config to either take no 'Config' input or only Config input.
    as it is right now it takes a Config and a 'nics_cfg_list'.
    but the nics_cfg_list is completely derived from the Config, so why not just pass the Config?

    its probably helpful to just have a:
       get_network_config_from_conf()
    that calls:
       get_network_config(nameservers=None, search=None, nics=None)

c.) It'll be helpful if there is an easy way to go from a vmwareImcConfigFilePath contents to a network config. Then your tests will just do:
    nc = network_config_from_vmware_cfg("""
[NETWORK]
NETWORKING = yes
BOOTPROTO = dhcp
HOSTNAME = myhost1
DOMAINNAME = eng.vmware.com

[NIC-CONFIG]
NICS = NIC1,NIC2

[NIC1]
...
""")
    self.assertEqual(expected, found)

394a132... by Sankar Tanguturi on 2017-03-16

  Addressed review comments from Scott Moser.

  - Added few private variables to use in the future when
  the NICS have to be enabled when the customization gets completed.
  - Re-factored the code. Implemented few wrapper functions to
  make the code more readable and make testing easier.
  - Modified the unit test code accordingly.
  - Remove the code to clear dhcp. Now that the datasource is just
  returning the network configuration, cloud-init / curtin should
  take care of all dhcp settings.

[Sankar Tanguturi (sankaraditya)]

> a.) I think I'd like to move the conversion of the network config out of the
> 'get'.
> The LOG.debug "Applying the network customization" is actually incorrect in
> that
> no changes are done there. Lets move that to happen in the
> 'network_config' function.
>
> if self._network_config is not None:
> return self._network_config
>
> ## convert the network config from the data in 'self' here to to the
> desired
> ## 'network_config' format.
> nc = NicConcifugrator(self.conf.nics)
> cfg = get_vmware_network_config(...)
> self._network_config = cfg
> return self.network_config

Thanks for the comments. I tried modifying the code as per your suggestion and found an issue. When cloud-init runs in local mode initially, the datasourceOVF returned the data and then cloud-init saved the instance some where. During this stage, _network_config is saved as False. And then network-config property is called. The local mode finished. When the cloud-init in 'network' mode started, it loaded the saved instance. Since the _network_config is not saved, whenever this property is retrieved, the same code is executed again. This is not quite right for our use case.

Any suggestion to fix this?

[Scott Moser (smoser)]

Why was the network information not available in 'local' mode?

You'll have to show the code that you tried with, because nothing in your current tree here will set _network_config to false.

You're right that we have to get the network config in local mode otherwise it wont be applied early enough.

[Scott Moser (smoser)]

I'd also recommend storing the contents of vmwareImcConfigFilePath to the instance during 'get_data'.

self._vmware_conf_contents = util.load_file(vmwareImcConfigFilePath)

and then when you make a 'ConfigFile' object pass those contents in (you'll have ot modify it to take a string contents instead of having ConfigFile take a filename.

[Sankar Tanguturi (sankaraditya)]

> Why was the network information not available in 'local' mode?
>
> You'll have to show the code that you tried with, because nothing in your
> current tree here will set _network_config to false.
>
> You're right that we have to get the network config in local mode otherwise it
> wont be applied early enough.

Sorry if my previous comment was not clear. (_network_config was set to None and not False). Let me explain:

1. When the cloud-init initially runs in 'local' mode, first getdata is called and the necessary settings are retrieved. Now that we modified the code to retrieve the network code to 'network_config', getdata will not return the network data. At that point, cloud-init saves the datasource instance and it will have self._network_config set to None. When network-config property is retrieved, proper content is retrieved. This is perfect and works as expected.

2. After few seconds, cloud-init runs in 'network' mode. This time, the saved instance is retrieved and since the self._network_config is saved as None, when network-config property is retrieved, our 'function' to get the NICs information is called. This function should be called only once and not multiple times.

So, to avoid this, I think, self._network_config should be populated as a part of 'getData' function only.

Thanks
Sankar.

4bb42b4... by Sankar Tanguturi on 2017-03-17

  Added the code to wait for nics.txt file.

  NICS.txt is another file that is populated by 'VMware Tools'
  daemon which contains the information related to NICS. Added the
  code to wait for nics.txt file.

[Sankar Tanguturi (sankaraditya)]

Addressed few review comments. Updated the code and also the tests.

In the getData() function itself, we want to parse the network configuration and return an error if parsing fails. For that reason, I didn't move the 'network config' part from getData() to network_config @property method.

Thanks

[Scott Moser (smoser)]

Can you open a bug for this? Just so I have something to track.
  https://bugs.launchpad.net/cloud-init/+filebug

I think my request for get_network_config does not make any sense any more.
The way you've done it now, there is basically no value in that function. No one calls it directly, so just make it part of 'get_network_config_from_conf'.

Some other comments in line, nothing huge.
Good work Sankar,
Scott

[Sankar Tanguturi (sankaraditya)]

> Can you open a bug for this? Just so I have something to track.
> https://bugs.launchpad.net/cloud-init/+filebug

Scott,
Thanks for the valuable comments. For what part, you are asking me to file a bug?

[Sankar Tanguturi (sankaraditya)]

Will fix as per the review comments and update the diff. I have only one question about the 'activate' method. I mentioned below.

Thanks
Sankar.

2f2d810... by Sankar Tanguturi on 2017-03-21

  Fixed some nits suggested by Scott Moser.

[Scott Moser (smoser)]

Sankar, I went ahead and opened a bug. I just wanted something to track this larger set of changes.

One other request in this Merge. We should now be able to drop NicConfigurator and any tests that exist for it as this will all be getting rendered with cloud-init's generic renderers.

[Sankar Tanguturi (sankaraditya)]

> One other request in this Merge. We should now be able to drop
> NicConfigurator and any tests that exist for it as this will all be getting
> rendered with cloud-init's generic renderers.

I don't think we can drop the NicConfigurator. It the the class that generates the necessary network config in curtin format. It doesn't not actually configure the nics but just reads the mac addresses of the system and returns proper network data.

[Sankar Tanguturi (sankaraditya)]

Working on some small nits. Will update the diff.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:4bb42b4f22c709bfb43f5001fe2bfefca1021b3a
https://jenkins.ubuntu.com/server/job/cloud-init-ci/156/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/156
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/156
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/156
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/156
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/156

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/156/rebuild

review: Approve (continuous-integration)

8e3bb47... by Sankar Tanguturi on 2017-03-27

Merge branch 'master' into topic-stanguturi-vmware-curtin

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:8e3bb4741863602058824fb04f44a48062b2a464
https://jenkins.ubuntu.com/server/job/cloud-init-ci/165/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/165
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/165
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/165
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/165
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/165

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/165/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

one small comment. this was as far as I got just yet.

[Chad Smith (chad.smith)]

Looks really good. Long term I would like to see us hoist some of the ip-command parsing utilities up into cloudinit.net.network_state or net.__init__ but that doesn't have to be part of this branch. I added a few inline comments or questions. Nothing major, I just wanted some clarification to better understand the approach.

Thanks again for this work. let's wrap up these branches early next week if we can. Sorry for the delay.

[Sankar Tanguturi (sankaraditya)]

Thanks Chad and Scott for your valuable inputs.

Will address all review comments and will update the diff.

4301c29... by Sankar Tanguturi on 2017-08-16

  Addressed few review comments from Chad Smith and Scott Moser.

  - Added a docstring to each test function.
  - Removed few unnecessary log messages.
  - Removed 'enable_nics' in a specific code path where it is really not
  required.
  - Fixed a typo in a comment.
  - Modified wait_for_imc_cfg_file to take dirpath as optional argument
  and look into /var/run/vmware-imc by default.

[Sankar Tanguturi (sankaraditya)]

Updating the diff after addressing review comments from Chat and SCott. Thanks.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:4301c299aaffaf2fcc02e32d72e365464e5ae391
https://jenkins.ubuntu.com/server/job/cloud-init-ci/160/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/160/rebuild

review: Needs Fixing (continuous-integration)

13e4e08... by Sankar Tanguturi on 2017-08-18

Merge branch 'master' into current topic branch.

Resolved Conflicts:
 cloudinit/sources/DataSourceOVF.py
 tests/unittests/test_vmware_config_file.py

39d7aae... by Sankar Tanguturi on 2017-08-18

  Fixing few issues after the recent merge with master.

  - Use mask_to_net_prefix instead of mask2cidr
  - Fixing few issues reported by flake / tox
  - Modified the code to enable NICS only in successful case.
    In the case of failure, no request will be sent to
    the underlying hypervisor to enable the NICS.
  - Minor code refactoring.

[Chad Smith (chad.smith)]

Thanks for the comment updates and questions answered Sankar!
Looks like this branch only needs a git rebase to fixup the following conflicts:
Conflict in cloudinit/sources/DataSourceOVF.py
Conflict in tests/unittests/test_vmware_config_file.py

# from your branch: you probably already know this, it was kindof new to me
git pull origin/master
git rebase origin/master
# iterate through any conflicts, edit conflicts git add <conflict_files>; git rebase --continue

[Sankar Tanguturi (sankaraditya)]

Resolved conflicts and updated the diff. Thanks.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:39d7aaed101f06c4095890f40f442c9097b9e9eb
https://jenkins.ubuntu.com/server/job/cloud-init-ci/190/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/190/rebuild

review: Approve (continuous-integration)

a3d130d... by Sankar Tanguturi on 2017-08-25

  Add 'source interfaces.d/*.cfg' line to /etc/network/interfaces

  Modified the code to configure the /etc/network/interfaces file
  for debian guests. The 'configure' operation takes a backup of
  the file and writes 'source /etc/network/interfaces.d/*.cfg' line so that
  the cloud-init rendered config in /etc/network/interfaces.d/...cfg
  file will be used.

  Fixed the wait_for_imc_cfg_file function. Used os.path.isfile()

[Sankar Tanguturi (sankaraditya)]

As discussed with Chad Smith today during 'cloud-init' meeting, updated the diff to add 'source /etc/network/interfaces.d/*.cfg' line to /etc/network/interfaces file during debian customization.

Thanks Chad.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a3d130dc31e8f166c0bd89851a18d3f3220fdfc0
https://jenkins.ubuntu.com/server/job/cloud-init-ci/197/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/197/rebuild

review: Approve (continuous-integration)

891e2d3... by Sankar Tanguturi on 2017-08-25

  Generate a unique instance id for the ds so that re-customization
  will happen in cloud-init.

[Sankar Tanguturi (sankaraditya)]

In VMware guest customization workflow, we should be able to do re-customization. After discussing with Scott and Chad, modified the code to generate a unique id when there is a customization. This will force the cloud-init to do the re-customization.

Thanks Scott and Chad.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:891e2d38d3eb1541771531ede27c6562d6ca2ad4
https://jenkins.ubuntu.com/server/job/cloud-init-ci/202/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/202/rebuild

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

Good update on random instance-id Sankar, if you can instrument or add to an existing unit test that exposes the instance-id update +1 on this branch.

e0a6eb6... by Sankar Tanguturi on 2017-08-25

  Adding a new unit test case for the instance-id for DataSourceOVF

  Fixed the typo in config_nic.py
  Added a new unit test case for DataSourceOVF instance-id
  Fixed the docstring for the functions comments in config_nic.py

[Sankar Tanguturi (sankaraditya)]

Addressed all review comments from Chad and updated the diff.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:e0a6eb60c18ec3fa921ffe16afd8c2dbbc8931fb
https://jenkins.ubuntu.com/server/job/cloud-init-ci/208/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/208/rebuild

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

Thanks Sankar for the fixes.
Since, as you mentioned, the python configuration engine overwrites /etc/network/interfaces anyway, I see this as an improvement over the existing image behavior (as any user-modified changes already got lost due to the perl conifiguration engine). At least this documents behavior with the comment
 # DO NOT EDIT THIS FILE BY HAND -- AUTOMATICALLY GENERATED BY cloud-init.

Thanks for the additional unit test on randomized instance-id. etc.
Just some minor nits on the unit tests.
Wherever possible please don't use assertTrue( some conditional) because unit test errors in those cases are not helpful, they only say "AssertionError: False is not true". But if you use assertEqual() or assertIn you get slightly more informative test errors:

AssertionError: 'iid-vmware-' not found in 'some-random-instance-id-CFtW7ekG'

I approve after your unittest fixups are there

f0b2b7c... by Sankar Tanguturi on 2017-08-31

  Fix test_vmware_config_file test script.

  Replaced self.assertTrue with self.assertIn and self.assertEqual
  at few places in the code.

[Sankar Tanguturi (sankaraditya)]

Fixed the new unit test case as Chad suggested. Thanks.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:f0b2b7cba92cd940ad3931a487087abb4126b019
https://jenkins.ubuntu.com/server/job/cloud-init-ci/241/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    FAILED: MAAS Compatability Testing

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/241/rebuild

review: Needs Fixing (continuous-integration)

[Chad Smith (chad.smith)]

LGTM; +1 and thanks.

review: Approve

[Sankar Tanguturi (sankaraditya)]

> LGTM; +1 and thanks.

Thanks Chad.

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:f0b2b7cba92cd940ad3931a487087abb4126b019
https://jenkins.ubuntu.com/server/job/cloud-init-ci/242/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/242/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:f0b2b7cba92cd940ad3931a487087abb4126b019
https://jenkins.ubuntu.com/server/job/cloud-init-ci/248/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/248/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

approving based on Chad's review and talking with Sankar.

review: Approve

diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py
index 73d3877..aa5f798 100644
--- a/cloudinit/sources/DataSourceOVF.py
+++ b/cloudinit/sources/DataSourceOVF.py
@@ -51,6 +51,10 @@ class DataSourceOVF(sources.DataSource):
         self.cfg = {}
         self.supported_seed_starts = ("/", "file://")
         self.vmware_customization_supported = True
+        self._network_config = None
+        self._vmware_nics_to_enable = None
+        self._vmware_cust_conf = None
+        self._vmware_cust_found = False
 
     def __str__(self):
         root = sources.DataSource.__str__(self)
@@ -60,8 +64,8 @@ class DataSourceOVF(sources.DataSource):
         found = []
         md = {}
         ud = ""
-        vmwarePlatformFound = False
-        vmwareImcConfigFilePath = ''
+        vmwareImcConfigFilePath = None
+        nicspath = None
 
         defaults = {
             "instance-id": "iid-dsovf",
@@ -101,25 +105,26 @@ class DataSourceOVF(sources.DataSource):
                         logfunc=LOG.debug,
                         msg="waiting for configuration file",
                         func=wait_for_imc_cfg_file,
-                        args=("/var/run/vmware-imc", "cust.cfg", max_wait))
+                        args=("cust.cfg", max_wait))
 
                 if vmwareImcConfigFilePath:
                     LOG.debug("Found VMware Customization Config File at %s",
                               vmwareImcConfigFilePath)
+                    nicspath = wait_for_imc_cfg_file(
+                        filename="nics.txt", maxwait=10, naplen=5)
                 else:
                     LOG.debug("Did not find VMware Customization Config File")
             else:
                 LOG.debug("Customization for VMware platform is disabled.")
 
         if vmwareImcConfigFilePath:
-            nics = ""
+            self._vmware_nics_to_enable = ""
             try:
                 cf = ConfigFile(vmwareImcConfigFilePath)
-                conf = Config(cf)
-                (md, ud, cfg) = read_vmware_imc(conf)
-                dirpath = os.path.dirname(vmwareImcConfigFilePath)
-                nics = get_nics_to_enable(dirpath)
-                markerid = conf.marker_id
+                self._vmware_cust_conf = Config(cf)
+                (md, ud, cfg) = read_vmware_imc(self._vmware_cust_conf)
+                self._vmware_nics_to_enable = get_nics_to_enable(nicspath)
+                markerid = self._vmware_cust_conf.marker_id
                 markerexists = check_marker_exists(markerid)
             except Exception as e:
                 LOG.debug("Error parsing the customization Config File")
@@ -127,28 +132,29 @@ class DataSourceOVF(sources.DataSource):
                 set_customization_status(
                     GuestCustStateEnum.GUESTCUST_STATE_RUNNING,
                     GuestCustEventEnum.GUESTCUST_EVENT_CUSTOMIZE_FAILED)
-                enable_nics(nics)
-                return False
+                raise e
             finally:
                 util.del_dir(os.path.dirname(vmwareImcConfigFilePath))
             try:
-                LOG.debug("Applying the Network customization")
-                nicConfigurator = NicConfigurator(conf.nics)
-                nicConfigurator.configure()
+                LOG.debug("Preparing the Network configuration")
+                self._network_config = get_network_config_from_conf(
+                    self._vmware_cust_conf,
+                    True,
+                    True,
+                    self.distro.osfamily)
             except Exception as e:
-                LOG.debug("Error applying the Network Configuration")
                 LOG.exception(e)
                 set_customization_status(
                     GuestCustStateEnum.GUESTCUST_STATE_RUNNING,
                     GuestCustEventEnum.GUESTCUST_EVENT_NETWORK_SETUP_FAILED)
-                enable_nics(nics)
-                return False
+                raise e
+
             if markerid and not markerexists:
                 LOG.debug("Applying password customization")
                 pwdConfigurator = PasswordConfigurator()
-                adminpwd = conf.admin_password
+                adminpwd = self._vmware_cust_conf.admin_password
                 try:
-                    resetpwd = conf.reset_password
+                    resetpwd = self._vmware_cust_conf.reset_password
                     if adminpwd or resetpwd:
                         pwdConfigurator.configure(adminpwd, resetpwd,
                                                   self.distro)
@@ -159,7 +165,6 @@ class DataSourceOVF(sources.DataSource):
                     set_customization_status(
                         GuestCustStateEnum.GUESTCUST_STATE_RUNNING,
                         GuestCustEventEnum.GUESTCUST_EVENT_CUSTOMIZE_FAILED)
-                    enable_nics(nics)
                     return False
             if markerid:
                 LOG.debug("Handle marker creation")
@@ -170,14 +175,18 @@ class DataSourceOVF(sources.DataSource):
                     set_customization_status(
                         GuestCustStateEnum.GUESTCUST_STATE_RUNNING,
                         GuestCustEventEnum.GUESTCUST_EVENT_CUSTOMIZE_FAILED)
-                    enable_nics(nics)
                     return False
 
-            vmwarePlatformFound = True
+            self._vmware_cust_found = True
+            found.append('vmware-tools')
+
+            # TODO: Need to set the status to DONE only when the
+            # customization is done successfully.
             set_customization_status(
                 GuestCustStateEnum.GUESTCUST_STATE_DONE,
                 GuestCustErrorEnum.GUESTCUST_ERROR_SUCCESS)
-            enable_nics(nics)
+            enable_nics(self._vmware_nics_to_enable)
+
         else:
             np = {'iso': transport_iso9660,
                   'vmware-guestd': transport_vmware_guestd, }
@@ -192,7 +201,7 @@ class DataSourceOVF(sources.DataSource):
                 found.append(name)
 
         # There was no OVF transports found
-        if len(found) == 0 and not vmwarePlatformFound:
+        if len(found) == 0:
             return False
 
         if 'seedfrom' in md and md['seedfrom']:
@@ -237,6 +246,10 @@ class DataSourceOVF(sources.DataSource):
     def get_config_obj(self):
         return self.cfg
 
+    @property
+    def network_config(self):
+        return self._network_config
+
 
 class DataSourceOVFNet(DataSourceOVF):
     def __init__(self, sys_cfg, distro, paths):
@@ -268,12 +281,13 @@ def get_max_wait_from_cfg(cfg):
     return max_wait
 
 
-def wait_for_imc_cfg_file(dirpath, filename, maxwait=180, naplen=5):
+def wait_for_imc_cfg_file(filename, maxwait=180, naplen=5,
+                          dirpath="/var/run/vmware-imc"):
     waited = 0
 
     while waited < maxwait:
-        fileFullPath = search_file(dirpath, filename)
-        if fileFullPath:
+        fileFullPath = os.path.join(dirpath, filename)
+        if os.path.isfile(fileFullPath):
             return fileFullPath
         LOG.debug("Waiting for VMware Customization Config File")
         time.sleep(naplen)
@@ -281,6 +295,26 @@ def wait_for_imc_cfg_file(dirpath, filename, maxwait=180, naplen=5):
     return None
 
 
+def get_network_config_from_conf(config, use_system_devices=True,
+                                 configure=False, osfamily=None):
+    nicConfigurator = NicConfigurator(config.nics, use_system_devices)
+    nics_cfg_list = nicConfigurator.generate(configure, osfamily)
+
+    return get_network_config(nics_cfg_list,
+                              config.name_servers,
+                              config.dns_suffixes)
+
+
+def get_network_config(nics=None, nameservers=None, search=None):
+    config_list = nics
+
+    if nameservers or search:
+        config_list.append({'type': 'nameserver', 'address': nameservers,
+                            'search': search})
+
+    return {'version': 1, 'config': config_list}
+
+
 # This will return a dict with some content
 #  meta-data, user-data, some config
 def read_vmware_imc(config):
@@ -296,6 +330,9 @@ def read_vmware_imc(config):
     if config.timezone:
         cfg['timezone'] = config.timezone
 
+    # Generate a unique instance-id so that re-customization will
+    # happen in cloud-init
+    md['instance-id'] = "iid-vmware-" + util.rand_str(strlen=8)
     return (md, ud, cfg)
 
 
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py
index 67ac21d..2fb07c5 100644
--- a/cloudinit/sources/helpers/vmware/imc/config_nic.py
+++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py
@@ -9,22 +9,48 @@ import logging
 import os
 import re
 
+from cloudinit.net.network_state import mask_to_net_prefix
 from cloudinit import util
 
 logger = logging.getLogger(__name__)
 
 
+def gen_subnet(ip, netmask):
+    """
+    Return the subnet for a given ip address and a netmask
+    @return (str): the subnet
+    @param ip: ip address
+    @param netmask: netmask
+    """
+    ip_array = ip.split(".")
+    mask_array = netmask.split(".")
+    result = []
+    for index in list(range(4)):
+        result.append(int(ip_array[index]) & int(mask_array[index]))
+
+    return ".".join([str(x) for x in result])
+
+
 class NicConfigurator(object):
-    def __init__(self, nics):
+    def __init__(self, nics, use_system_devices=True):
         """
         Initialize the Nic Configurator
         @param nics (list) an array of nics to configure
+        @param use_system_devices (Bool) Get the MAC names from the system
+        if this is True. If False, then mac names will be retrieved from
+         the specified nics.
         """
         self.nics = nics
         self.mac2Name = {}
         self.ipv4PrimaryGateway = None
         self.ipv6PrimaryGateway = None
-        self.find_devices()
+
+        if use_system_devices:
+            self.find_devices()
+        else:
+            for nic in self.nics:
+                self.mac2Name[nic.mac.lower()] = nic.name
+
         self._primaryNic = self.get_primary_nic()
 
     def get_primary_nic(self):
@@ -61,138 +87,163 @@ class NicConfigurator(object):
 
     def gen_one_nic(self, nic):
         """
-        Return the lines needed to configure a nic
-        @return (str list): the string list to configure the nic
+        Return the config list needed to configure a nic
+        @return (list): the subnets and routes list to configure the nic
         @param nic (NicBase): the nic to configure
         """
-        lines = []
-        name = self.mac2Name.get(nic.mac.lower())
+        mac = nic.mac.lower()
+        name = self.mac2Name.get(mac)
         if not name:
             raise ValueError('No known device has MACADDR: %s' % nic.mac)
 
-        if nic.onboot:
-            lines.append('auto %s' % name)
+        nics_cfg_list = []
+
+        cfg = {'type': 'physical', 'name': name, 'mac_address': mac}
+
+        subnet_list = []
+        route_list = []
 
         # Customize IPv4
-        lines.extend(self.gen_ipv4(name, nic))
+        (subnets, routes) = self.gen_ipv4(name, nic)
+        subnet_list.extend(subnets)
+        route_list.extend(routes)
 
         # Customize IPv6
-        lines.extend(self.gen_ipv6(name, nic))
+        (subnets, routes) = self.gen_ipv6(name, nic)
+        subnet_list.extend(subnets)
+        route_list.extend(routes)
+
+        cfg.update({'subnets': subnet_list})
 
-        lines.append('')
+        nics_cfg_list.append(cfg)
+        if route_list:
+            nics_cfg_list.extend(route_list)
 
-        return lines
+        return nics_cfg_list
 
     def gen_ipv4(self, name, nic):
         """
-        Return the lines needed to configure the IPv4 setting of a nic
-        @return (str list): the string list to configure the gateways
-        @param name (str): name of the nic
+        Return the set of subnets and routes needed to configure the
+        IPv4 settings of a nic
+        @return (set): the set of subnet and routes to configure the gateways
+        @param name (str): subnet and route list for the nic
         @param nic (NicBase): the nic to configure
         """
-        lines = []
+
+        subnet = {}
+        route_list = []
+
+        if nic.onboot:
+            subnet.update({'control': 'auto'})
 
         bootproto = nic.bootProto.lower()
         if nic.ipv4_mode.lower() == 'disabled':
             bootproto = 'manual'
-        lines.append('iface %s inet %s' % (name, bootproto))
 
         if bootproto != 'static':
-            return lines
+            subnet.update({'type': 'dhcp'})
+            return ([subnet], route_list)
+        else:
+            subnet.update({'type': 'static'})
 
         # Static Ipv4
         addrs = nic.staticIpv4
         if not addrs:
-            return lines
+            return ([subnet], route_list)
 
         v4 = addrs[0]
         if v4.ip:
-            lines.append('    address %s' % v4.ip)
+            subnet.update({'address': v4.ip})
         if v4.netmask:
-            lines.append('    netmask %s' % v4.netmask)
+            subnet.update({'netmask': v4.netmask})
 
         # Add the primary gateway
         if nic.primary and v4.gateways:
             self.ipv4PrimaryGateway = v4.gateways[0]
-            lines.append('    gateway %s metric 0' % self.ipv4PrimaryGateway)
-            return lines
+            subnet.update({'gateway': self.ipv4PrimaryGateway})
+            return [subnet]
 
         # Add routes if there is no primary nic
         if not self._primaryNic:
-            lines.extend(self.gen_ipv4_route(nic, v4.gateways))
+            route_list.extend(self.gen_ipv4_route(nic,
+                                                  v4.gateways,
+                                                  v4.netmask))
 
-        return lines
+        return ([subnet], route_list)
 
-    def gen_ipv4_route(self, nic, gateways):
+    def gen_ipv4_route(self, nic, gateways, netmask):
         """
-        Return the lines needed to configure additional Ipv4 route
-        @return (str list): the string list to configure the gateways
+        Return the routes list needed to configure additional Ipv4 route
+        @return (list): the route list to configure the gateways
         @param nic (NicBase): the nic to configure
         @param gateways (str list): the list of gateways
         """
-        lines = []
+        route_list = []
+
+        cidr = mask_to_net_prefix(netmask)
 
         for gateway in gateways:
-            lines.append('    up route add default gw %s metric 10000' %
-                         gateway)
+            destination = "%s/%d" % (gen_subnet(gateway, netmask), cidr)
+            route_list.append({'destination': destination,
+                               'type': 'route',
+                               'gateway': gateway,
+                               'metric': 10000})
 
-        return lines
+        return route_list
 
     def gen_ipv6(self, name, nic):
         """
-        Return the lines needed to configure the gateways for a nic
-        @return (str list): the string list to configure the gateways
+        Return the set of subnets and routes needed to configure the
+        gateways for a nic
+        @return (set): the set of subnets and routes to configure the gateways
         @param name (str): name of the nic
         @param nic (NicBase): the nic to configure
         """
-        lines = []
 
         if not nic.staticIpv6:
-            return lines
+            return ([], [])
 
+        subnet_list = []
         # Static Ipv6
         addrs = nic.staticIpv6
-        lines.append('iface %s inet6 static' % name)
-        lines.append('    address %s' % addrs[0].ip)
-        lines.append('    netmask %s' % addrs[0].netmask)
 
-        for addr in addrs[1:]:
-            lines.append('    up ifconfig %s inet6 add %s/%s' % (name, addr.ip,
-                                                                 addr.netmask))
-        # Add the primary gateway
-        if nic.primary:
-            for addr in addrs:
-                if addr.gateway:
-                    self.ipv6PrimaryGateway = addr.gateway
-                    lines.append('    gateway %s' % self.ipv6PrimaryGateway)
-                    return lines
+        for addr in addrs:
+            subnet = {'type': 'static6',
+                      'address': addr.ip,
+                      'netmask': addr.netmask}
+            subnet_list.append(subnet)
 
-        # Add routes if there is no primary nic
-        if not self._primaryNic:
-            lines.extend(self._genIpv6Route(name, nic, addrs))
+        # TODO: Add the primary gateway
+
+        route_list = []
+        # TODO: Add routes if there is no primary nic
+        # if not self._primaryNic:
+        #    route_list.extend(self._genIpv6Route(name, nic, addrs))
 
-        return lines
+        return (subnet_list, route_list)
 
     def _genIpv6Route(self, name, nic, addrs):
-        lines = []
+        route_list = []
 
         for addr in addrs:
-            lines.append('    up route -A inet6 add default gw '
-                         '%s metric 10000' % addr.gateway)
+            route_list.append({'type': 'route',
+                               'gateway': addr.gateway,
+                               'metric': 10000})
+
+        return route_list
 
-        return lines
+    def generate(self, configure=False, osfamily=None):
+        """Return the config elements that are needed to configure the nics"""
+        if configure:
+            logger.info("Configuring the interfaces file")
+            self.configure(osfamily)
 
-    def generate(self):
-        """Return the lines that is needed to configure the nics"""
-        lines = []
-        lines.append('iface lo inet loopback')
-        lines.append('auto lo')
-        lines.append('')
+        nics_cfg_list = []
 
         for nic in self.nics:
-            lines.extend(self.gen_one_nic(nic))
+            nics_cfg_list.extend(self.gen_one_nic(nic))
 
-        return lines
+        return nics_cfg_list
 
     def clear_dhcp(self):
         logger.info('Clearing DHCP leases')
@@ -201,11 +252,16 @@ class NicConfigurator(object):
         util.subp(["pkill", "dhclient"], rcs=[0, 1])
         util.subp(["rm", "-f", "/var/lib/dhcp/*"])
 
-    def configure(self):
+    def configure(self, osfamily=None):
         """
-        Configure the /etc/network/intefaces
+        Configure the /etc/network/interfaces
         Make a back up of the original
         """
+
+        if not osfamily or osfamily != "debian":
+            logger.info("Debian OS not detected. Skipping the configure step")
+            return
+
         containingDir = '/etc/network'
 
         interfaceFile = os.path.join(containingDir, 'interfaces')
@@ -215,10 +271,13 @@ class NicConfigurator(object):
         if not os.path.exists(originalFile) and os.path.exists(interfaceFile):
             os.rename(interfaceFile, originalFile)
 
-        lines = self.generate()
-        with open(interfaceFile, 'w') as fp:
-            for line in lines:
-                fp.write('%s\n' % line)
+        lines = [
+            "# DO NOT EDIT THIS FILE BY HAND --"
+            " AUTOMATICALLY GENERATED BY cloud-init",
+            "source /etc/network/interfaces.d/*.cfg",
+        ]
+
+        util.write_file(interfaceFile, content='\n'.join(lines))
 
         self.clear_dhcp()
 
diff --git a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
index 1ab6bd4..4407525 100644
--- a/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
+++ b/cloudinit/sources/helpers/vmware/imc/guestcust_util.py
@@ -59,14 +59,16 @@ def set_customization_status(custstate, custerror, errormessage=None):
     return (out, err)
 
 
-# This will read the file nics.txt in the specified directory
-# and return the content
-def get_nics_to_enable(dirpath):
-    if not dirpath:
+def get_nics_to_enable(nicsfilepath):
+    """Reads the NICS from the specified file path and returns the content
+
+    @param nicsfilepath: Absolute file path to the NICS.txt file.
+    """
+
+    if not nicsfilepath:
         return None
 
     NICS_SIZE = 1024
-    nicsfilepath = os.path.join(dirpath, "nics.txt")
     if not os.path.exists(nicsfilepath):
         return None
 
diff --git a/tests/unittests/test_vmware_config_file.py b/tests/unittests/test_vmware_config_file.py
index 03b36d3..2572ee8 100644
--- a/tests/unittests/test_vmware_config_file.py
+++ b/tests/unittests/test_vmware_config_file.py
@@ -9,9 +9,13 @@ import logging
 import sys
 
 from .helpers import CiTestCase
+from cloudinit.sources.DataSourceOVF import get_network_config_from_conf
+from cloudinit.sources.DataSourceOVF import read_vmware_imc
 from cloudinit.sources.helpers.vmware.imc.boot_proto import BootProtoEnum
 from cloudinit.sources.helpers.vmware.imc.config import Config
 from cloudinit.sources.helpers.vmware.imc.config_file import ConfigFile
+from cloudinit.sources.helpers.vmware.imc.config_nic import gen_subnet
+from cloudinit.sources.helpers.vmware.imc.config_nic import NicConfigurator
 
 logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
 logger = logging.getLogger(__name__)
@@ -20,6 +24,7 @@ logger = logging.getLogger(__name__)
 class TestVmwareConfigFile(CiTestCase):
 
     def test_utility_methods(self):
+        """Tests basic utility methods of ConfigFile class"""
         cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
 
         cf.clear()
@@ -43,7 +48,26 @@ class TestVmwareConfigFile(CiTestCase):
         self.assertFalse(cf.should_keep_current_value("BAR"), "keepBar")
         self.assertTrue(cf.should_remove_current_value("BAR"), "removeBar")
 
+    def test_datasource_instance_id(self):
+        """Tests instance id for the DatasourceOVF"""
+        cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
+
+        instance_id_prefix = 'iid-vmware-'
+
+        conf = Config(cf)
+
+        (md1, _, _) = read_vmware_imc(conf)
+        self.assertIn(instance_id_prefix, md1["instance-id"])
+        self.assertEqual(len(md1["instance-id"]), len(instance_id_prefix) + 8)
+
+        (md2, _, _) = read_vmware_imc(conf)
+        self.assertIn(instance_id_prefix, md2["instance-id"])
+        self.assertEqual(len(md2["instance-id"]), len(instance_id_prefix) + 8)
+
+        self.assertNotEqual(md1["instance-id"], md2["instance-id"])
+
     def test_configfile_static_2nics(self):
+        """Tests Config class for a configuration with two static NICs."""
         cf = ConfigFile("tests/data/vmware/cust-static-2nic.cfg")
 
         conf = Config(cf)
@@ -81,6 +105,7 @@ class TestVmwareConfigFile(CiTestCase):
         self.assertTrue(not nics[1].staticIpv6, "ipv61 dhcp")
 
     def test_config_file_dhcp_2nics(self):
+        """Tests Config class for a configuration with two DHCP NICs."""
         cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
 
         conf = Config(cf)
@@ -117,5 +142,197 @@ class TestVmwareConfigFile(CiTestCase):
         conf = Config(cf)
         self.assertTrue(conf.reset_password, "reset password")
 
+    def test_get_config_nameservers(self):
+        """Tests DNS and nameserver settings in a configuration."""
+        cf = ConfigFile("tests/data/vmware/cust-static-2nic.cfg")
+
+        config = Config(cf)
+
+        network_config = get_network_config_from_conf(config, False)
+
+        self.assertEqual(1, network_config.get('version'))
+
+        config_types = network_config.get('config')
+        name_servers = None
+        dns_suffixes = None
+
+        for type in config_types:
+            if type.get('type') == 'nameserver':
+                name_servers = type.get('address')
+                dns_suffixes = type.get('search')
+                break
+
+        self.assertEqual(['10.20.145.1', '10.20.145.2'],
+                         name_servers,
+                         "dns")
+        self.assertEqual(['eng.vmware.com', 'proxy.vmware.com'],
+                         dns_suffixes,
+                         "suffixes")
+
+    def test_gen_subnet(self):
+        """Tests if gen_subnet properly calculates network subnet from
+           IPv4 address and netmask"""
+        ip_subnet_list = [['10.20.87.253', '255.255.252.0', '10.20.84.0'],
+                          ['10.20.92.105', '255.255.252.0', '10.20.92.0'],
+                          ['192.168.0.10', '255.255.0.0', '192.168.0.0']]
+        for entry in ip_subnet_list:
+            self.assertEqual(entry[2], gen_subnet(entry[0], entry[1]),
+                             "Subnet for a specified ip and netmask")
+
+    def test_get_config_dns_suffixes(self):
+        """Tests if get_network_config_from_conf properly
+           generates nameservers and dns settings from a
+           specified configuration"""
+        cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
+
+        config = Config(cf)
+
+        network_config = get_network_config_from_conf(config, False)
+
+        self.assertEqual(1, network_config.get('version'))
+
+        config_types = network_config.get('config')
+        name_servers = None
+        dns_suffixes = None
+
+        for type in config_types:
+            if type.get('type') == 'nameserver':
+                name_servers = type.get('address')
+                dns_suffixes = type.get('search')
+                break
+
+        self.assertEqual([],
+                         name_servers,
+                         "dns")
+        self.assertEqual(['eng.vmware.com'],
+                         dns_suffixes,
+                         "suffixes")
+
+    def test_get_nics_list_dhcp(self):
+        """Tests if NicConfigurator properly calculates network subnets
+           for a configuration with a list of DHCP NICs"""
+        cf = ConfigFile("tests/data/vmware/cust-dhcp-2nic.cfg")
+
+        config = Config(cf)
+
+        nicConfigurator = NicConfigurator(config.nics, False)
+        nics_cfg_list = nicConfigurator.generate()
+
+        self.assertEqual(2, len(nics_cfg_list), "number of config elements")
+
+        nic1 = {'name': 'NIC1'}
+        nic2 = {'name': 'NIC2'}
+        for cfg in nics_cfg_list:
+            if cfg.get('name') == nic1.get('name'):
+                nic1.update(cfg)
+            elif cfg.get('name') == nic2.get('name'):
+                nic2.update(cfg)
+
+        self.assertEqual('physical', nic1.get('type'), 'type of NIC1')
+        self.assertEqual('NIC1', nic1.get('name'), 'name of NIC1')
+        self.assertEqual('00:50:56:a6:8c:08', nic1.get('mac_address'),
+                         'mac address of NIC1')
+        subnets = nic1.get('subnets')
+        self.assertEqual(1, len(subnets), 'number of subnets for NIC1')
+        subnet = subnets[0]
+        self.assertEqual('dhcp', subnet.get('type'), 'DHCP type for NIC1')
+        self.assertEqual('auto', subnet.get('control'), 'NIC1 Control type')
+
+        self.assertEqual('physical', nic2.get('type'), 'type of NIC2')
+        self.assertEqual('NIC2', nic2.get('name'), 'name of NIC2')
+        self.assertEqual('00:50:56:a6:5a:de', nic2.get('mac_address'),
+                         'mac address of NIC2')
+        subnets = nic2.get('subnets')
+        self.assertEqual(1, len(subnets), 'number of subnets for NIC2')
+        subnet = subnets[0]
+        self.assertEqual('dhcp', subnet.get('type'), 'DHCP type for NIC2')
+        self.assertEqual('auto', subnet.get('control'), 'NIC2 Control type')
+
+    def test_get_nics_list_static(self):
+        """Tests if NicConfigurator properly calculates network subnets
+           for a configuration with 2 static NICs"""
+        cf = ConfigFile("tests/data/vmware/cust-static-2nic.cfg")
+
+        config = Config(cf)
+
+        nicConfigurator = NicConfigurator(config.nics, False)
+        nics_cfg_list = nicConfigurator.generate()
+
+        self.assertEqual(5, len(nics_cfg_list), "number of elements")
+
+        nic1 = {'name': 'NIC1'}
+        nic2 = {'name': 'NIC2'}
+        route_list = []
+        for cfg in nics_cfg_list:
+            cfg_type = cfg.get('type')
+            if cfg_type == 'physical':
+                if cfg.get('name') == nic1.get('name'):
+                    nic1.update(cfg)
+                elif cfg.get('name') == nic2.get('name'):
+                    nic2.update(cfg)
+            elif cfg_type == 'route':
+                route_list.append(cfg)
+
+        self.assertEqual('physical', nic1.get('type'), 'type of NIC1')
+        self.assertEqual('NIC1', nic1.get('name'), 'name of NIC1')
+        self.assertEqual('00:50:56:a6:8c:08', nic1.get('mac_address'),
+                         'mac address of NIC1')
+
+        subnets = nic1.get('subnets')
+        self.assertEqual(2, len(subnets), 'Number of subnets')
+
+        static_subnet = []
+        static6_subnet = []
+
+        for subnet in subnets:
+            subnet_type = subnet.get('type')
+            if subnet_type == 'static':
+                static_subnet.append(subnet)
+            elif subnet_type == 'static6':
+                static6_subnet.append(subnet)
+            else:
+                self.assertEqual(True, False, 'Unknown type')
+
+        self.assertEqual(1, len(static_subnet), 'Number of static subnet')
+        self.assertEqual(1, len(static6_subnet), 'Number of static6 subnet')
+
+        subnet = static_subnet[0]
+        self.assertEqual('10.20.87.154', subnet.get('address'),
+                         'IPv4 address of static subnet')
+        self.assertEqual('255.255.252.0', subnet.get('netmask'),
+                         'NetMask of static subnet')
+        self.assertEqual('auto', subnet.get('control'),
+                         'control for static subnet')
+
+        subnet = static6_subnet[0]
+        self.assertEqual('fc00:10:20:87::154', subnet.get('address'),
+                         'IPv6 address of static subnet')
+        self.assertEqual('64', subnet.get('netmask'),
+                         'NetMask of static6 subnet')
+
+        route_set = set(['10.20.87.253', '10.20.87.105', '192.168.0.10'])
+        for route in route_list:
+            self.assertEqual(10000, route.get('metric'), 'metric of route')
+            gateway = route.get('gateway')
+            if gateway in route_set:
+                route_set.discard(gateway)
+            else:
+                self.assertEqual(True, False, 'invalid gateway %s' % (gateway))
+
+        self.assertEqual('physical', nic2.get('type'), 'type of NIC2')
+        self.assertEqual('NIC2', nic2.get('name'), 'name of NIC2')
+        self.assertEqual('00:50:56:a6:ef:7d', nic2.get('mac_address'),
+                         'mac address of NIC2')
+
+        subnets = nic2.get('subnets')
+        self.assertEqual(1, len(subnets), 'Number of subnets for NIC2')
+
+        subnet = subnets[0]
+        self.assertEqual('static', subnet.get('type'), 'Subnet type')
+        self.assertEqual('192.168.6.102', subnet.get('address'),
+                         'Subnet address')
+        self.assertEqual('255.255.0.0', subnet.get('netmask'),
+                         'Subnet netmask')
+
 
 # vi: ts=4 expandtab