Merge branch 'main' into enable-markdownlint-rule-MD012

jbampton · web-flow · commit 06d67eb481fb · 2024-12-25T17:21:38.000+10:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Apache CloudStack [![Build Status](https://github.com/apache/cloudstack/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/build.yml) [![UI Build](https://github.com/apache/cloudstack/actions/workflows/ui.yml/badge.svg)](https://github.com/apache/cloudstack/actions/workflows/ui.yml) [![License Check](https://github.com/apache/cloudstack/actions/workflows/rat.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/rat.yml) [![Simulator CI](https://github.com/apache/cloudstack/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/ci.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache_cloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache_cloudstack) [![codecov](https://codecov.io/gh/apache/cloudstack/branch/main/graph/badge.svg)](https://codecov.io/gh/apache/cloudstack)
 
-[![Apache CloudStack](tools/logo/apache_cloudstack.png)](https://cloudstack.apache.org/)
+[![Apache CloudStack](tools/logo/acsxmas.jpg)](https://cloudstack.apache.org/)
 
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable
diff --git a/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py b/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py
@@ -29,7 +29,7 @@
 
 try:
   if normalRepo:
-    print "normal repo"
+    print("normal repo")
     # this literally throws EVERYTHING away on the repo
     repoDom = parseString(server.discover_repository_db())
     for node in repoDom.getElementsByTagName('Repository'):
@@ -43,16 +43,16 @@
         # in which repo it lives....
         for dirname, dirnames, filenames in os.walk('%s/VirtualMachines/' % localMount):
             for vm in dirnames:
-                print "Destroying vm: %s on repo %s" % (vm, repoUuid.value)
+                print("Destroying vm: %s on repo %s" % (vm, repoUuid.value))
                 try:
                     mVm = server.list_vm(repoUuid.value, vm)
-                    if mVm != None:
-                        print server.stop_vm(repoUuid.value, vm)
-                        print server.delete_vm(repoUuid.value, vm)
+                    if mVm is not None:
+                        print(server.stop_vm(repoUuid.value, vm))
+                        print(server.delete_vm(repoUuid.value, vm))
                     else:
-                        print "%s already not in repo %s" % (repoUuid.value, vm)
-                except Error, v:
-                    print "Unable to destroy: %s" % (v)
+                        print("%s already not in repo %s" % (repoUuid.value, vm))
+                except Error as v:
+                    print("Unable to destroy: %s" % v)
                     continue
 
         # VMs = server.list_vms()
@@ -63,15 +63,15 @@
 
         rc = server.delete_repository(repoUuid.value, True)
         # Set to false if you want to keep data:      ^^^^
-        print "Repository: %s" % repoUuid.value
-        if (rc == None):
-            print "Ok repo: %s destroyed!" % repoUuid.value
+        print("Repository: %s" % repoUuid.value)
+        if rc is None:
+            print("Ok repo: %s destroyed!" % repoUuid.value)
             # now unmount the FS
             # print server.unmount_repository_fs(localMount)
         else:
-            print "Failed repo: %s not destroyed!" % repoUuid.value
+            print("Failed repo: %s not destroyed!" % repoUuid.value)
 
-    # for now only treat NFS stuff as we're testing with that..
+    # for now only treat NFS stuff as we're testing with that.
     nfsHost = 'cs-mgmt'
     nfsDom = server.storage_plugin_listMountPoints(
         'oracle.generic.NFSPlugin.GenericNFSPlugin',
@@ -111,19 +111,18 @@
     nfsDom = parseString(server.discover_mounted_file_systems('nfs'))
     for node in nfsDom.getElementsByTagName('Mount'):
         nfsMnt = node.attributes['Dir'].value
-        print 'Mountpoint: %s' % (nfsMnt)
+        print('Mountpoint: %s' % nfsMnt)
         fsStamp = '%s/.generic_fs_stamp' % nfsMnt
         # remove this so we don't cock up next run
         if os.path.isfile(fsStamp):
-            print "Stamp found: %s" % fsStamp
+            print("Stamp found: %s" % fsStamp)
             os.unlink(fsStamp)
 
         rc = server.storage_plugin_unmount('oracle.generic.NFSPlugin.GenericNFSPlugin', props, extprops, nfsMnt, True)
-        print rc
-
+        print(rc)
 
   if pooledFs:
-    print "pooling"
+    print("pooling")
     # pool stuff
     poolalias = "ItsMyPool"
     poolmvip = "192.168.1.161"
@@ -153,60 +152,60 @@
     # eventually cluster cleanup can be done by removing
     #   stuff from /etc/ovs-agent/db
     #   also clean /etc/ocfs2/cluster.conf
-    print server.create_pool_filesystem(
+    print(server.create_pool_filesystem(
         fstype,
         fstarget,
         clusterid,
         poolfsuuid,
         poolfsnfsbaseuuid,
         manageruuid,
         pooluuid
-    )
+    ))
 
     # poolDom = server.discover_server_pool()
     # print poolDom
     # poolDom = parseString(server.discover_server_pool())
     # if poolDom.getElementsByTagName('Server_Pool'):
     # get unique id
     cluster = server.is_cluster_online()
-    if cluster == True:
-        print "clean up pool"
+    if cluster:
+        print("clean up pool")
         # print server.destroy_cluster(poolfsuuid)
         # deconfigure cluster
         # print server.destroy_server_pool(poolid)
 
-    if cluster == False:
-        print "create_server_pool"
+    if not cluster:
+        print("create_server_pool")
         # first take ownership. without an owner nothing happens
-        print server.take_ownership(manageruuid, "")
+        print(server.take_ownership(manageruuid, ""))
         # we need to add the first host first to the pool....
         poolDom = server.discover_server_pool()
-        print poolDom
+        print(poolDom)
         poolDom = parseString(server.discover_server_pool())
         if poolDom.getElementsByTagName('Server_Pool'):
-            print server.destroy_server_pool(pooluuid)
+            print(server.destroy_server_pool(pooluuid))
 
-        print server.create_pool_filesystem(
+        print(server.create_pool_filesystem(
             fstype,
             fstarget,
             clusterid,
             poolfsuuid,
             poolfsnfsbaseuuid,
             manageruuid,
             pooluuid
-        )
-        print server.create_server_pool(poolalias,
+        ))
+        print(server.create_server_pool(poolalias,
             pooluuid,
             poolmvip,
             poolfirsthost['id'],
             poolfirsthost['hn'],
             poolfirsthost['ip'],
-            poolfirsthost['role'])
+            poolfirsthost['role']))
 
-        print "configure_virtual_ip"
+        print("configure_virtual_ip")
         server.configure_virtual_ip(poolmvip, poolfirsthost['ip'])
         server.set_pool_member_ip_list(['192.168.1.64', '192.168.1.65'],)
-        print "configure for cluster"
+        print("configure for cluster")
         server.configure_server_for_cluster(
             {
                 'O2CB_HEARTBEAT_THRESHOLD': '61',
@@ -247,25 +246,25 @@
             poolfsuuid,
             poolfsnfsbaseuuid
         )
-        print "create cluster"
+        print("create cluster")
         server.create_cluster(poolfsuuid,)
 
     poolDom = parseString(server.discover_server_pool())
     for node in poolDom.getElementsByTagName('Server_Pool'):
         id = node.getElementsByTagName('Unique_Id')[0].firstChild.nodeValue
         alias = node.getElementsByTagName('Pool_Alias')[0].firstChild.nodeValue
         mvip = node.getElementsByTagName('Primary_Virtual_Ip')[0].firstChild.nodeValue
-        print "pool: %s, %s, %s" % (id, mvip, alias)
+        print("pool: %s, %s, %s" % (id, mvip, alias))
         members = node.getElementsByTagName('Member')
         for member in members:
             mip = member.getElementsByTagName('Registered_IP')[0].firstChild.nodeValue
-            print "member: %s" % (mip)
+            print("member: %s" % mip)
 
-    print server.is_cluster_online()
-    print server.discover_cluster()
-    print server.discover_pool_filesystem()
-    print server.discover_server_pool()
+    print(server.is_cluster_online())
+    print(server.discover_cluster())
+    print(server.discover_pool_filesystem())
+    print(server.discover_server_pool())
     # server.destroy_server_pool(pooluuid)
 
-except Error, v:
-    print "ERROR", v
+except Error as v:
+    print("ERROR", v)
diff --git a/ui/src/views/network/CreateVpc.vue b/ui/src/views/network/CreateVpc.vue
@@ -62,6 +62,7 @@
             </a-select-option>
           </a-select>
         </a-form-item>
+        <ownership-selection v-if="isAdminOrDomainAdmin()" @fetch-owner="fetchOwnerOptions"/>
         <a-form-item name="cidr" ref="cidr" v-if="selectedVpcOffering && (selectedVpcOffering.networkmode !== 'ROUTED' || isAdmin())">
           <template #label>
             <tooltip-label :title="$t('label.cidr')" :tooltip="apiParams.cidr.description"/>
@@ -210,13 +211,15 @@
 <script>
 import { ref, reactive, toRaw } from 'vue'
 import { api } from '@/api'
-import { isAdmin } from '@/role'
+import { isAdmin, isAdminOrDomainAdmin } from '@/role'
 import ResourceIcon from '@/components/view/ResourceIcon'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
+import OwnershipSelection from '@/views/compute/wizard/OwnershipSelection.vue'
 
 export default {
   name: 'CreateVpc',
   components: {
+    OwnershipSelection,
     ResourceIcon,
     TooltipLabel
   },
@@ -267,6 +270,7 @@ export default {
     }
   },
   methods: {
+    isAdminOrDomainAdmin,
     initForm () {
       this.formRef = ref()
       this.form = reactive({
@@ -359,6 +363,28 @@ export default {
         }
       })
     },
+    fetchOwnerOptions (OwnerOptions) {
+      this.owner = {
+        projectid: null,
+        domainid: this.$store.getters.userInfo.domainid,
+        account: this.$store.getters.userInfo.account
+      }
+      if (OwnerOptions.selectedAccountType === 'Account') {
+        if (!OwnerOptions.selectedAccount) {
+          return
+        }
+        this.owner.account = OwnerOptions.selectedAccount
+        this.owner.domainid = OwnerOptions.selectedDomain
+        this.owner.projectid = null
+      } else if (OwnerOptions.selectedAccountType === 'Project') {
+        if (!OwnerOptions.selectedProject) {
+          return
+        }
+        this.owner.account = null
+        this.owner.domainid = null
+        this.owner.projectid = OwnerOptions.selectedProject
+      }
+    },
     handleVpcOfferingChange (value) {
       this.selectedVpcOffering = {}
       if (!value) {
@@ -398,7 +424,14 @@ export default {
       if (this.loading) return
       this.formRef.value.validate().then(() => {
         const values = toRaw(this.form)
-        const params = {}
+        var params = {}
+        if (this.owner?.account) {
+          params.account = this.owner.account
+          params.domainid = this.owner.domainid
+        } else if (this.owner?.projectid) {
+          params.domainid = this.owner.domainid
+          params.projectid = this.owner.projectid
+        }
         for (const key in values) {
           const input = values[key]
           if (input === '' || input === null || input === undefined) {
