Skip to content

Adding a nfs2 hardcoded entry in Trillian's test_data.py in order to …#18

Merged
DagSonsteboSB merged 5 commits into
masterfrom
update-test_data
Mar 9, 2017
Merged

Adding a nfs2 hardcoded entry in Trillian's test_data.py in order to …#18
DagSonsteboSB merged 5 commits into
masterfrom
update-test_data

Conversation

@borisstoyanov

Copy link
Copy Markdown
Member

…pass newly introduced test in apache/cloudstack#1961

@PaulAngus

Copy link
Copy Markdown

this path is not valid. - we use paths which include the environment name so that they are unique
url of OUR storage shouldn't be hard coded into Trillian code - use variable
additional storage location must be added to storage before it can be used.

@borisstoyanov

Copy link
Copy Markdown
Member Author

Thanks @PaulAngus, that makes sense. I guess I'll need to add task to create and delete the directory in the cloudstack-nfsshares/tasks/main.yml ?

@borisstoyanov

Copy link
Copy Markdown
Member Author

@PaulAngus can you look at this and comment if you're happy with this change so we could merge it or review it. There's a newly added test in the smoketests which is failing because of missing this.

@borisstoyanov

Copy link
Copy Markdown
Member Author

tests are passing as well:

[root@ref-trl-99-k-cs410-bstoyanov-marvin ~]# cat /marvin//MarvinLogs/test_snapshots_76YGPX/results.txt
Test Snapshot Root Disk ... === TestName: test_01_snapshot_root_disk | Status : SUCCESS ===
ok
Test listing volume snapshots with removed data stores ... === TestName: test_02_list_snapshots_with_removed_data_store | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 2 tests in 216.488s

OK

@PaulAngus

Copy link
Copy Markdown

it makes no functional difference, but you can make it neater by doing:

  • name: Create subfolders
    file: state=directory path={{ env_pripath }}{{ env_name_clean }}/{{ item }} mode=0755
    with_items:
    • "marvin_pri1"
    • "nfs2"
      when: build_marvin

@PaulAngus

PaulAngus commented Mar 7, 2017

Copy link
Copy Markdown

formatting made ' - ' into a circle
bitmoji

@borisstoyanov

Copy link
Copy Markdown
Member Author

I've added the requested changes, deployed an environment and tests are looking good.

[root@ref-trl-100-k-cs410-bstoyanov-marvin ~]# cat /marvin//MarvinLogs/test_snapshots_4U1I5D/results.txt
Test Snapshot Root Disk ... === TestName: test_01_snapshot_root_disk | Status : SUCCESS ===
ok
Test listing volume snapshots with removed data stores ... === TestName: test_02_list_snapshots_with_removed_data_store | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 2 tests in 630.004s

OK

Should we proceed with merging this now?

@DagSonsteboSB

DagSonsteboSB commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

Have updated code to:

  • Only run when addshares is called for primary folders.
  • Moved folder names to nested group vars.

Moved hardcoded folder names to nested group vars.
@borisstoyanov

Copy link
Copy Markdown
Member Author

Thanks for the change @DagSonsteboSB I've tested it and it works as expected now, it's skipping pool creation when it has to. Tests look good as well:

[root@ref-trl-104-k-cs410-bstoyanov-marvin ~]# cat /marvin//MarvinLogs/test_snapshots_6ZZRSL/results.txt
Test Snapshot Root Disk ... === TestName: test_01_snapshot_root_disk | Status : SUCCESS ===
ok
Test listing volume snapshots with removed data stores ... === TestName: test_02_list_snapshots_with_removed_data_store | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 2 tests in 224.234s

OK

@DagSonsteboSB

Copy link
Copy Markdown
Contributor

LGTM:

root@SBLabNestedNFS ref-trl-104-k-cs410-bstoyanov]# tree
.
├── 98c91cc6-8ad7-4158-86ea-3b8995417cd2
├── marvin_pri1
├── nfs2
│   └── KVMHA
│   └── hb-10.2.2.42
└── ref-trl-104-k-cs410-bstoyanov-kvm-pri1
├── 9cb8b3ee-d707-45fb-a924-c328f508eebe
├── 9db295e4-d9a3-4cba-9b54-a8dd34a668fa
├── a13f25bc-fadf-4748-9ddc-17811af714ad
└── KVMHA
└── hb-10.2.2.42

@DagSonsteboSB
DagSonsteboSB merged commit 969dabf into master Mar 9, 2017
@DagSonsteboSB
DagSonsteboSB deleted the update-test_data branch July 25, 2018 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants