Key value state + tests refactoring

.gitignore

@@ -8,4 +8,4 @@ html/
 result
 *.sw[a-z]
 tags
-tests/test.nixops*
+tests/state_files

clean_test_state_files.py

@@ -0,0 +1,15 @@
+#! /usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+from nixops.util import root_dir
+from tests.functional.shared.destroy_deployments_and_remove_state_file import destroy_deployments_and_remove_state_file
+from tests.functional.shared.state_files_directory import state_files_directory
+import os
+
+for file in os.listdir(state_files_directory):
+ if file.endswith(".nixops") or file.endswith(".json"):
+ file_path = os.path.join(state_files_directory, file)
+
+ print("Destroying {}".format(file_path))
+
+ destroy_deployments_and_remove_state_file(file_path)

nix/ec2-rds-dbinstance.nix

@@ -82,7 +82,7 @@ with import ./lib.nix lib;
  };
 
  securityGroups = mkOption {
- default = [ "default" ];
+ default = [ ];
  type = types.listOf (types.either types.str (resource "ec2-rds-security-group"));
  apply = map (x: if builtins.isString x then x else "res-" + x._name);
  description = ''

nix/ec2-rds-dbsecurity-group.nix

@@ -18,7 +18,7 @@ with import ./lib.nix lib;
  type = types.str;
  description = ''
  Description of the RDS DB security group.
- ''; 
+ '';
  };
 
  region = mkOption {

nix/hetzner-bootstrap.nix

@@ -104,7 +104,7 @@ in stdenv.mkDerivation {
  echo 'scriptheadsize="$(head -n ''${lnum%%:*} "'"$installer"'" | wc -c)"'
  echo 'scriptsize="$(${pkgsNative.coreutils}/bin/stat -c %s "'"$installer"'")"'
  echo 'tarsize="$(($scriptsize - $scriptheadsize))"'
- echo 'echo -n "$tarsize:"'
+ echo 'printf "$tarsize:"'
  echo 'tail -n +$((''${lnum%%:*} + 1)) "'"$installer"'"'
  # As before, don't quote here!
  echo '${pkgsNative.gnutar}/bin/tar c -C /' $stripped_full_storepaths

nixops/backends/azure_vm.py

@@ -972,7 +972,7 @@ def start(self):
 
  def stop(self):
  if self.vm_id:
- #FIXME: there's also "stopped deallocated" version of this. how to integrate?
+  # FIXME: there's also "stopped deallocated" version of this. how to integrate?
  self.log("stopping Azure machine... ")
  self.state = self.STOPPING
  self.cmc().virtual_machines.power_off(self.resource_group, self.machine_name)
@@ -1170,8 +1170,7 @@ def get_backups(self):
 
 
  def _check(self, res):
- if(self.subscription_id is None or self.authority_url is None or
- self.user is None or self.password is None):
+ if(self.subscription_id is None or self.authority_url is None):
  res.exists = False
  res.is_up = False
  self.state = self.MISSING;

nixops/backends/ec2.py

@@ -134,7 +134,7 @@ def __init__(self, depl, name, id):
 
  def _reset_state(self):
  """Discard all state pertaining to an instance."""
- with self.depl._db:
+ with self.depl._state.db:
  self.state = MachineState.MISSING
  self.associate_public_ip_address = None
  self.use_private_ip_address = None
@@ -373,7 +373,7 @@ def _instance_ip_ready(ins):
 
  self.log_end("{0} / {1}".format(instance.ip_address, instance.private_ip_address))
 
- with self.depl._db:
+ with self.depl._state.db:
  self.private_ipv4 = instance.private_ip_address
  self.public_ipv4 = instance.ip_address
  self.public_dns_name = instance.public_dns_name
@@ -655,7 +655,7 @@ def _assign_elastic_ip(self, elastic_ipv4, check):
 
  nixops.known_hosts.update(self.public_ipv4, elastic_ipv4, self.public_host_key)
 
- with self.depl._db:
+ with self.depl._state.db:
  self.elastic_ipv4 = elastic_ipv4
  self.public_ipv4 = elastic_ipv4
  self.ssh_pinged = False
@@ -668,7 +668,7 @@ def _assign_elastic_ip(self, elastic_ipv4, check):
  else:
  self.log("address ‘{0}’ was not associated with instance ‘{1}’".format(self.elastic_ipv4, self.vm_id))
 
- with self.depl._db:
+ with self.depl._state.db:
  self.elastic_ipv4 = None
  self.public_ipv4 = None
  self.ssh_pinged = False
@@ -732,7 +732,7 @@ def create_instance(self, defn, zone, devmap, user_data, ebs_optimized):
  lambda: self._conn.request_spot_instances(price=defn.spot_instance_price/100.0, **common_args)
  )[0]
 
- with self.depl._db:
+ with self.depl._state.db:
  self.spot_instance_price = defn.spot_instance_price
  self.spot_instance_request_id = request.id
 
@@ -763,7 +763,7 @@ def create_instance(self, defn, zone, devmap, user_data, ebs_optimized):
  # the instance ID, we'll get the same instance ID on the
  # next run.
  if not self.client_token:
- with self.depl._db:
+ with self.depl._state.db:
  self.client_token = nixops.util.generate_random_string(length=48) # = 64 ASCII chars
  self.state = self.STARTING
 
@@ -982,7 +982,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  # Generate a public/private host key.
  if not self.public_host_key:
  (private, public) = nixops.util.create_key_pair(type=defn.host_key_type())
- with self.depl._db:
+ with self.depl._state.db:
  self.public_host_key = public
  self.private_host_key = private
 
@@ -993,7 +993,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  instance = self.create_instance(defn, zone, devmap, user_data, ebs_optimized)
  update_instance_profile = False
 
- with self.depl._db:
+ with self.depl._state.db:
  self.vm_id = instance.id
  self.ami = defn.ami
  self.instance_type = defn.instance_type
@@ -1088,7 +1088,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  elastic_ipv4 = res.public_ipv4
  self._assign_elastic_ip(elastic_ipv4, check)
 
- with self.depl._db:
+ with self.depl._state.db:
  self.use_private_ip_address = defn.use_private_ip_address
  self.associate_public_ip_address = defn.associate_public_ip_address
 
@@ -1351,7 +1351,10 @@ def destroy(self, wipe=False):
  # in create() due to it being interrupted after the instance
  # was created but before it registered the ID in the database.
  self.connect()
+ self.connect_boto3()
+
  instance = None
+
  if self.vm_id:
  instance = self._get_instance(allow_missing=True)
  else:
@@ -1369,6 +1372,9 @@ def destroy(self, wipe=False):
  time.sleep(3)
  instance = self._get_instance(update=True)
 
+ # this will prevent `cannot delete ec2-security-group because it still has resources` error
+ nixops.ec2_utils.wait_for_network_interfaces_deattached(self._conn_boto3, self.vm_id)
+
  self.log_end("")
 
  nixops.known_hosts.update(self.public_ipv4, None, self.public_host_key)

nixops/backends/hetzner.py

@@ -594,7 +594,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  self.log_start("creating an exclusive robot admin sub-account "
  "for ‘{0}’... ".format(self.name))
  server = self._get_server_from_main_robot(self.main_ipv4, defn)
- with self.depl._db:
+ with self.depl._state.db:
  (self.robot_admin_user,
  self.robot_admin_pass) = server.admin.create()
  self.log_end("done. ({0})".format(self.robot_admin_user))
@@ -609,7 +609,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  )
  if robot_user != self.robot_admin_user or \
  robot_pass != self.robot_admin_pass:
- with self.depl._db:
+ with self.depl._state.db:
  (self.robot_admin_user,
  self.robot_admin_pass) = (robot_user, robot_pass)
 

nixops/backends/virtualbox.py

@@ -141,6 +141,7 @@ def _update_ip(self):
  capture_stdout=True).rstrip()
  if res[0:7] != "Value: ": return
  new_address = res[7:]
+
  nixops.known_hosts.update(self.private_ipv4, new_address, self.public_host_key)
  self.private_ipv4 = new_address
 
@@ -194,7 +195,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
  # Generate a public/private host key.
  if not self.public_host_key:
  (private, public) = nixops.util.create_key_pair()
- with self.depl._db:
+ with self.depl._state.db:
  self.public_host_key = public
  self.private_host_key = private
 
@@ -203,7 +204,7 @@ def create(self, defn, check, allow_reboot, allow_recreate):
 
  # Backwards compatibility.
  if self.disk:
- with self.depl._db:
+ with self.depl._state.db:
  self._update_disk("disk1", {"created": True, "path": self.disk,
  "attached": self.disk_attached,
  "port": 0})