[3/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
--
diff --git
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
new file mode 100644
index 000..cce6b50
--- /dev/null
+++
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.azurecompute.arm.compute.functions;
+
+import static
org.jclouds.azurecompute.arm.compute.extensions.AzureComputeImageExtension.CUSTOM_IMAGE_OFFER;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.jclouds.azurecompute.arm.AzureComputeApi;
+import
org.jclouds.azurecompute.arm.compute.config.AzureComputeServiceContextModule.AzureComputeConstants;
+import org.jclouds.azurecompute.arm.domain.ResourceDefinition;
+import org.jclouds.azurecompute.arm.domain.VMImage;
+import org.jclouds.azurecompute.arm.domain.VirtualMachine;
+import
org.jclouds.azurecompute.arm.functions.StorageProfileToStorageAccountName;
+import org.jclouds.compute.domain.Image;
+
+import com.google.common.base.Function;
+import com.google.inject.assistedinject.Assisted;
+
+public class ResourceDefinitionToCustomImage implements
Function {
+
+ public interface Factory {
+ ResourceDefinitionToCustomImage create(@Assisted("nodeId") String
nodeId, @Assisted("imageName") String imageName);
+ }
+
+ private final String resourceGroup;
+ private final Function vmImageToImage;
+ private final String imageName;
+ private final String storageAccountName;
+ private final VirtualMachine vm;
+
+ @Inject
+ ResourceDefinitionToCustomImage(AzureComputeApi api, AzureComputeConstants
azureComputeConstants,
+ StorageProfileToStorageAccountName storageProfileToStorageAccountName,
+ Function vmImageToImage, @Assisted("nodeId") String
nodeId,
+ @Assisted("imageName") String imageName) {
+ this.vmImageToImage = vmImageToImage;
+ this.resourceGroup = azureComputeConstants.azureResourceGroup();
+ this.imageName = imageName;
+ this.vm = api.getVirtualMachineApi(resourceGroup).get(nodeId);
+ this.storageAccountName =
storageProfileToStorageAccountName.apply(vm.properties().storageProfile());
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Image apply(ResourceDefinition input) {
+ VMImage.Builder builder =
VMImage.customImage().group(resourceGroup).storage(storageAccountName).name(imageName)
+.offer(CUSTOM_IMAGE_OFFER).location(vm.location());
+
+ Map properties = (Map)
input.properties();
+
+ Object storageObject = properties.get("storageProfile");
+ Map storageProperties = (Map)
storageObject;
+
+ Object osDiskObject = storageProperties.get("osDisk");
+ Map osProperties = (Map) osDiskObject;
+ builder.vhd1(osProperties.get("name"));
+
+ return vmImageToImage.apply(builder.build());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
--
diff --git
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
index f784842..9d9eceb 100644
---
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
+++
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
@@ -16,58 +16,50 @@
*/
package org.jclouds.azurecompute.arm.compute.functions;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static
org.jclouds.azurecompute.arm.compute.functions.DeploymentToN
[3/4] jclouds-labs git commit: Refactored Azure ARM to not use Deployments
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
--
diff --git
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
new file mode 100644
index 000..cce6b50
--- /dev/null
+++
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/ResourceDefinitionToCustomImage.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.azurecompute.arm.compute.functions;
+
+import static
org.jclouds.azurecompute.arm.compute.extensions.AzureComputeImageExtension.CUSTOM_IMAGE_OFFER;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.jclouds.azurecompute.arm.AzureComputeApi;
+import
org.jclouds.azurecompute.arm.compute.config.AzureComputeServiceContextModule.AzureComputeConstants;
+import org.jclouds.azurecompute.arm.domain.ResourceDefinition;
+import org.jclouds.azurecompute.arm.domain.VMImage;
+import org.jclouds.azurecompute.arm.domain.VirtualMachine;
+import
org.jclouds.azurecompute.arm.functions.StorageProfileToStorageAccountName;
+import org.jclouds.compute.domain.Image;
+
+import com.google.common.base.Function;
+import com.google.inject.assistedinject.Assisted;
+
+public class ResourceDefinitionToCustomImage implements
Function {
+
+ public interface Factory {
+ ResourceDefinitionToCustomImage create(@Assisted("nodeId") String
nodeId, @Assisted("imageName") String imageName);
+ }
+
+ private final String resourceGroup;
+ private final Function vmImageToImage;
+ private final String imageName;
+ private final String storageAccountName;
+ private final VirtualMachine vm;
+
+ @Inject
+ ResourceDefinitionToCustomImage(AzureComputeApi api, AzureComputeConstants
azureComputeConstants,
+ StorageProfileToStorageAccountName storageProfileToStorageAccountName,
+ Function vmImageToImage, @Assisted("nodeId") String
nodeId,
+ @Assisted("imageName") String imageName) {
+ this.vmImageToImage = vmImageToImage;
+ this.resourceGroup = azureComputeConstants.azureResourceGroup();
+ this.imageName = imageName;
+ this.vm = api.getVirtualMachineApi(resourceGroup).get(nodeId);
+ this.storageAccountName =
storageProfileToStorageAccountName.apply(vm.properties().storageProfile());
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Image apply(ResourceDefinition input) {
+ VMImage.Builder builder =
VMImage.customImage().group(resourceGroup).storage(storageAccountName).name(imageName)
+.offer(CUSTOM_IMAGE_OFFER).location(vm.location());
+
+ Map properties = (Map)
input.properties();
+
+ Object storageObject = properties.get("storageProfile");
+ Map storageProperties = (Map)
storageObject;
+
+ Object osDiskObject = storageProperties.get("osDisk");
+ Map osProperties = (Map) osDiskObject;
+ builder.vhd1(osProperties.get("name"));
+
+ return vmImageToImage.apply(builder.build());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/2f110387/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
--
diff --git
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
index f784842..9d9eceb 100644
---
a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
+++
b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/VMImageToImage.java
@@ -16,58 +16,50 @@
*/
package org.jclouds.azurecompute.arm.compute.functions;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static
org.jclouds.azurecompute.arm.compute.functions.DeploymentToN
