vagrant-delphix 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ebb2dc50427468204e85062a32aff1c1fed2b05
-  data.tar.gz: ce41033a44d50ad38e7d716540758de5f0c0142f
+  metadata.gz: 9e4f08c0ec2e96d200c4cce6c5b3711ae5368ee6
+  data.tar.gz: 7075fcef68483dc3d8418e4d7186a045609d40b3
 SHA512:
-  metadata.gz: 963ffb7d9892261c234bd321d9c54c456b1d586db1d484d2e373b6d0b79558f48d2b2070d648475a80b077d7bd0b7c7ffa829fff91f6c221150bf8544a6d7a66
-  data.tar.gz: b7c214a2217415db297b1c0b7c07321b2c2f09068510ab58eb83ac663979924e6217a669664bef7357510fa1db115250d9d9d35e503bf96468695d714b5804dc
+  metadata.gz: 53e80220e9505b179e688bae5c8bac4585ab765f7747c8c79c5712c33c3ec1c70024742acf246e557574340922dbb4211ca8d57fa0957a3da596f00676e26a5f
+  data.tar.gz: 5c0945b0d2ded90110a765b971d7572cae57b2142f53c2d2dcdbd0c255c51285d9bf7ed8b135efb4753a5afb78074c5a66405778830c41e03d2159975358979b

data/Gemfile.lock

@@ -24,8 +24,8 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-delphix (0.1.2)
-      delphix_rb (~> 0.3.2)
+    vagrant-delphix (1.1.0)
+      delphix_rb (~> 1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -33,7 +33,7 @@ GEM
     builder (3.2.2)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
-    delphix_rb (0.3.2)
+    delphix_rb (1.1.0)
       excon (~> 0.45.4)
     domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)

data/lib/vagrant-delphix/action/destroy_environment.rb

@@ -17,7 +17,6 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant::delphix_engine::create_environment')
 
           @config = get_config(@machine)
-
         end
 
         def call(env)
@@ -32,11 +31,10 @@ module VagrantPlugins
           Delphix.authenticate!(@config.engine_user,@config.engine_password)
 
           # lookup the environment
-          environments = Delphix::Environment.list
-          environment = environments.lookup_by_name @config.env_name
+          environment = Delphix::Environment.list.lookup_by_name @config.env_name
 
-          # delete the environment from Delphix
-          environment.delete if environment != nil
+          # Delete the environment and all its sources. Blocks until completion or error.
+          environment.delete.wait_for_completion if environment != nil
 
           @app.call(env)
         end

data/lib/vagrant-delphix/action/disable_environment.rb

@@ -31,11 +31,10 @@ module VagrantPlugins
           Delphix.authenticate!(@config.engine_user,@config.engine_password)
 
           # lookup the environment
-          environments = Delphix::Environment.list
-          environment = environments.lookup_by_name @config.env_name
+          environment = Delphix::Environment.list.lookup_by_name @config.env_name
 
-          # delete the environment from Delphix
-          environment.disable if environment != nil
+          # Disable the environment and all its sources. Blocks until completion or error.
+          environment.disable.wait_for_completion if environment != nil
 
           @app.call(env)
         end

data/lib/vagrant-delphix/action/enable_environment.rb

@@ -31,11 +31,10 @@ module VagrantPlugins
           Delphix.authenticate!(@config.engine_user,@config.engine_password)
 
           # lookup the environment
-          environments = Delphix::Environment.list
-          environment = environments.lookup_by_name @config.env_name
+          environment = Delphix::Environment.list.lookup_by_name @config.env_name
 
-          # delete the environment from Delphix
-          environment.enable if environment != nil
+          # Enable the environment but no sources. Blocks until completion or error.
+          environment.enable.wait_for_completion if environment != nil
 
           @app.call(env)
         end

data/lib/vagrant-delphix/provisioner.rb

@@ -26,12 +26,11 @@ module VagrantPlugins
         Delphix.authenticate!(@config.engine_user,@config.engine_password)
 
         # lookup the environment
-        environments = Delphix::Environment.list
-        environment = environments.lookup_by_name @config.env_name
+        environment = Delphix::Environment.list.lookup_by_name @config.env_name
 
         if environment == nil
-          # ceate a new environment
-          environment = Delphix::Environment.create @config.env_name, @config.env_ip, @config.env_port, @config.toolkit_path, @config.user, @config.password
+          # Ceate a new environment. This call blocks until the environment is ready or there was an error.
+          Delphix::Environment.create @config.env_name, @config.env_ip, @config.env_port, @config.toolkit_path, @config.user, @config.password
         else
           # enable the environment
           environment.enable

data/lib/vagrant-delphix/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DelphixEngine
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/test/Vagrantfile

@@ -18,32 +18,29 @@ VMWARE_NETWORK_ADAPTER ||= ENV['VMWARE_NETWORK_ADAPTER'] || 'vmnet8'
 IP_BASE = DELPHIX_ENGINE_IP.split('.')[0..2].join('.')
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  
+
   # Every Vagrant environment requires a box to build off of.
-  config.vm.box = "bento/centos-6.7"  
-  
+  config.vm.box = "ratchetcc/delphix"
+
   # size of the box
   config.vm.provider :virtualbox do |vb|
     vb.memory = VB_MEMORY
     vb.cpus = VB_CPUS
   end
-  
+
   #config the delphix provisioner
   config.delphix.enabled = true
-  config.delphix.engine_url = "http://172.16.138.157"
+  config.delphix.engine_url = "http://de.delphix.local"
   config.delphix.engine_user = 'delphix_admin'
   config.delphix.engine_password = 'delphix'
-  
-  # tasks for all environments
-  config.vm.provision "shell", path: "prepare_delphix.sh"
-  
+
   config.vm.define "source" do |node|
-    
+
     # networking
     public_ipv4 = "#{IP_BASE}.42"
     node.vm.hostname = "source.#{DOMAIN_NAME}"
     node.vm.network "public_network", ip: public_ipv4, bridge: VMWARE_NETWORK_ADAPTER
-    
+
     # configure the Delphix provisioner
     node.delphix.trace = false
     node.delphix.env_name = "source"
@@ -52,12 +49,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     node.delphix.user = 'delphix'
     node.delphix.password = 'delphix'
     node.delphix.toolkit_path = '/home/delphix/toolkit'
-    
-    # execute the Delphix provisioner. 
+
+    # execute the Delphix provisioner.
     node.vm.provision :delphix, run: "always"
-    # option run: "always" is a MUST for now, 
-    # otherwise the environment will not be re-enabled once the VM has been shut doen ...
-    
+    # option run: "always" is a MUST for now,
+    # otherwise the environment will not be re-enabled once the VM has been shut down ...
+
   end
-  
+
 end

data/vagrant-delphix.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler', '~> 1.3'
   gem.add_development_dependency 'rake'
 
-  gem.add_dependency 'delphix_rb', '~> 1.0.0'
+  gem.add_dependency 'delphix_rb', '~> 1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-delphix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Kuehl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: A Vagrant plugin that interacts with the Delphix Engine
 email:
 - michael.kuehl@delphix.com
@@ -79,7 +79,6 @@ files:
 - lib/vagrant-delphix/version.rb
 - locales/en.yml
 - test/Vagrantfile
-- test/prepare_delphix.sh
 - test/rake_test_destroy.sh
 - test/rake_test_halt.sh
 - test/rake_test_up.sh
@@ -110,7 +109,6 @@ specification_version: 4
 summary: A Vagrant plugin that interacts with the Delphix Engine
 test_files:
 - test/Vagrantfile
-- test/prepare_delphix.sh
 - test/rake_test_destroy.sh
 - test/rake_test_halt.sh
 - test/rake_test_up.sh

data/test/prepare_delphix.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# create locations for app and Delphix engine toolkit
-export SETUP_HOME=/home/delphix
-export TOOLKIT_HOME=$SETUP_HOME/toolkit
-
-sudo echo "# DELPHIX #" >> /etc/profile
-sudo echo "export SETUP_HOME=/home/delphix" >> /etc/profile
-sudo echo "export TOOLKIT_HOME=$SETUP_HOME/toolkit" >> /etc/profile
-
-# create a delphix user 
-useradd delphix
-echo delphix | passwd delphix --stdin
-
-# toolkit location
-sudo mkdir -p $TOOLKIT_HOME
-chown delphix:delphix $TOOLKIT_HOME
-chmod 0770 $TOOLKIT_HOME
-
-# add the user to wheel, i.e. sudoer group
-sudo usermod -a -G wheel delphix
-
-# add some requ.
-sudo yum -y install glibc.i686 java-1.7.0-openjdk