Merge pull request #52 from QualiSystems/dev

release 6.0.0

Author: saklar13

.github/workflows/create-github-release.yml

@@ -9,7 +9,7 @@ on:
       - master
 jobs:
   shell-ci:
-    uses: QualiSystems/.github/.github/workflows/shell-py-37-39.yml@master
+    uses: QualiSystems/.github/.github/workflows/shell-py-39.yml@master
   github-release:
     needs: shell-ci
     uses: QualiSystems/.github/.github/workflows/shell-github-release.yml@master

.github/workflows/shell.yml

@@ -9,4 +9,4 @@ on:
       - master
 jobs:
   shell-ci:
-    uses: QualiSystems/.github/.github/workflows/shell-py-37-39.yml@master
+    uses: QualiSystems/.github/.github/workflows/shell-py-39.yml@master

.github/workflows/update-github-release.yml

@@ -2,7 +2,7 @@ name: update release
 on: workflow_dispatch
 jobs:
   shell-ci:
-    uses: QualiSystems/.github/.github/workflows/shell-py-37-39.yml@master
+    uses: QualiSystems/.github/.github/workflows/shell-py-39.yml@master
   github-release:
     needs: shell-ci
     uses: QualiSystems/.github/.github/workflows/shell-github-release.yml@master

.pre-commit-config.yaml

@@ -1,20 +1,20 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args:
-          - "--py37-plus"
+          - "--py39-plus"
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/python/black
-    rev: 22.3.0
+    rev: 22.12.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
       - id: flake8
         additional_dependencies: [

deployments/deployment-path.yaml

@@ -20,7 +20,7 @@ node_types:
         type: string
         description: "vCenter VM to use in the VM creation. Should include the full path
         and the vm name, for example QualiFolder/VM121"
-        tags: [user_input, editable_only_in_app_template]
+        tags: [user_input, editable_only_in_app_template, enable_hints]
       VM Cluster:
         type: string
         description: "The vCenter cluster or host that will be used when deploying a VM.
@@ -124,6 +124,11 @@ node_types:
         would be the same as App name."
         default: true
         tags: []
+      Copy source UUID:
+        type: boolean
+        description: "If true the BIOS UUID of the source VM will be copied to the new VM."
+        default: false
+        tags: [user_input]
     artifacts:
       icon:
         file: shell-icon.png
@@ -136,7 +141,7 @@ node_types:
         type: string
         description: "vCenter VM template to use in the VM creation. Should include the full path and
         the template name, for example QualiFolder/Template1"
-        tags: [user_input, editable_only_in_app_template]
+        tags: [user_input, editable_only_in_app_template, enable_hints]
       VM Cluster:
         type: string
         description: "The vCenter cluster or host that will be used when deploying a VM.
@@ -240,6 +245,11 @@ node_types:
         would be the same as App name."
         default: true
         tags: []
+      Copy source UUID:
+        type: boolean
+        description: "If true the BIOS UUID of the source VM will be copied to the new VM."
+        default: false
+        tags: [ user_input ]
     artifacts:
       icon:
         file: shell-icon.png
@@ -252,13 +262,13 @@ node_types:
         type: string
         description: "vCenter VM to use in the VM creation. Should include the full path
         and the vm name, for example QualiFolder/VM121"
-        tags: [user_input, editable_only_in_app_template]
+        tags: [user_input, editable_only_in_app_template, enable_hints]
       vCenter VM Snapshot:
         type: string
         description: "The snapshot that will be used to clone a new VM. This snapshot should be associated
         with the VM defined in the vCenter VM input. Should include the full path of the snapshot,
         for example Snapshot1/Snapshot2"
-        tags: [user_input, editable_only_in_app_template]
+        tags: [user_input, editable_only_in_app_template, enable_hints]
       VM Cluster:
         type: string
         description: "The vCenter cluster or host that will be used when deploying a VM.
@@ -362,6 +372,11 @@ node_types:
         would be the same as App name."
         default: true
         tags: []
+      Copy source UUID:
+        type: boolean
+        description: "If true the BIOS UUID of the source VM will be copied to the new VM."
+        default: false
+        tags: [ user_input ]
     artifacts:
       icon:
         file: shell-icon.png

shell-definition.yaml

@@ -3,7 +3,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0
 metadata:
   template_name: VMware vCenter Cloud Provider Shell 2G
   template_author: Quali
-  template_version: 4.2.5
+  template_version: 6.0.0
   template_icon: shell-icon.png
 
 description: >
@@ -70,6 +70,12 @@ node_types:
           Promiscuous Mode:
             type: boolean
             default: true
+          Forged Transmits:
+            type: boolean
+            default: true
+          MAC Address Changes:
+            type: boolean
+            default: false
           Enable Tags:
             type: boolean
             default: true
@@ -121,7 +127,16 @@ node_types:
         description: "Reserved networks separated by Semicolon(;), vNICs configured to those networks won't be used for VM connectivity."
       Promiscuous Mode:
         type: boolean
-        description: "If enabled the port groups on the virtual switch will be configured to allow promiscuous mode."
+        description: "If enabled the port groups on the virtual switch will be 
+        configured to allow promiscuous mode."
+      Forged Transmits:
+        type: boolean
+        description: "If enabled the port groups on the virtual switch will be
+         configured to allow forged transmits."
+      MAC Address Changes:
+        type: boolean
+        description: "If enabled the port groups on the virtual switch will be 
+        configured to allow MAC address changes."
       Enable Tags:
         type: boolean
         default: true

src/driver.py

@@ -29,6 +29,7 @@
     refresh_ip,
     validate_attributes,
 )
+from cloudshell.cp.vcenter.flows.affinity_rules_flow import AffinityRulesFlow
 from cloudshell.cp.vcenter.flows.connectivity_flow import VCenterConnectivityFlow
 from cloudshell.cp.vcenter.flows.customize_guest_os import customize_guest_os
 from cloudshell.cp.vcenter.flows.save_restore_app import SaveRestoreAppFlow
@@ -508,3 +509,20 @@ def customize_guest_os(
                 override_custom_spec,
                 logger,
             )
+
+    def add_vm_to_affinity_rule(
+        self,
+        context: ResourceCommandContext,
+        vm_uuids: str,
+        affinity_rule_name: str | None,
+    ) -> str:
+        with LoggingSessionContext(context) as logger:
+            logger.info("Starting Add VMs to Affinity Rule command")
+            api = CloudShellSessionContext(context).get_api()
+            resource_config = VCenterResourceConfig.from_context(context, api=api)
+            reservation_info = ReservationInfo.from_resource_context(context)
+            flow = AffinityRulesFlow(
+                resource_config, reservation_info.reservation_id, logger
+            )
+            vm_uuids = [path.strip() for path in vm_uuids.split(";")]
+            return flow.add_vms_to_affinity_rule(vm_uuids, affinity_rule_name)

src/drivermetadata.xml

@@ -55,6 +55,12 @@
                     <Parameter Description="Override any prepared customization spec for the VM" DisplayName="Override Customization Spec" Name="override_custom_spec" Type="Lookup" AllowedValues="True,False"  DefaultValue="False" />
                 </Parameters>
             </Command>
+            <Command Description="" DisplayName="Add VMs to an affinity rule" Name="add_vm_to_affinity_rule" Tags="allow_unreserved">
+                <Parameters>
+                    <Parameter Description="UUIDs of the VMs separated by ';' to add to the affinity rule" DisplayName="VM UUIDs" Name="vm_uuids" Type="String" />
+                    <Parameter Description="Name of the existing affinity rule" DisplayName="Affinity Rule Name" Name="affinity_rule_name" Type="String" Mandatory="False" />
+                </Parameters>
+            </Command>
         </Category>
         <Category Name="Power">
             <Command Description="" DisplayName="Power On" Name="PowerOn" Tags="power" />

src/requirements.txt

@@ -1,3 +1,3 @@
 cloudshell-shell-core~=5.0
 cloudshell-cp-core~=2.4
-cloudshell-cp-vcenter>=4.2.5,<5.0
+cloudshell-cp-vcenter~=5.0