| Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php |
| — | — | @@ -165,10 +165,10 @@ |
| 166 | 166 | * @param $groupname |
| 167 | 167 | * @return OpenStackNovaSecurityGroup |
| 168 | 168 | */ |
| 169 | | - function getSecurityGroup( $groupname ) { |
| | 169 | + function getSecurityGroup( $groupname, $project ) { |
| 170 | 170 | $this->getSecurityGroups(); |
| 171 | | - if ( isset( $this->securityGroups["$groupname"] ) ) { |
| 172 | | - return $this->securityGroups["$groupname"]; |
| | 171 | + if ( isset( $this->securityGroups["$project-$groupname"] ) ) { |
| | 172 | + return $this->securityGroups["$project-$groupname"]; |
| 173 | 173 | } else { |
| 174 | 174 | return null; |
| 175 | 175 | } |
| — | — | @@ -183,8 +183,9 @@ |
| 184 | 184 | $securityGroups = $securityGroups->body->securityGroupInfo->item; |
| 185 | 185 | foreach ( $securityGroups as $securityGroup ) { |
| 186 | 186 | $securityGroup = new OpenStackNovaSecurityGroup( $securityGroup ); |
| | 187 | + $project = $securityGroup->getOwner(); |
| 187 | 188 | $groupname = $securityGroup->getGroupName(); |
| 188 | | - $this->securityGroups["$groupname"] = $securityGroup; |
| | 189 | + $this->securityGroups["$project-$groupname"] = $securityGroup; |
| 189 | 190 | } |
| 190 | 191 | return $this->securityGroups; |
| 191 | 192 | } |